Merge pull request #591 from reactjs/sync-8201e7e9

Merge pull request #591 from reactjs/sync-8201e7e9 #467