Merge pull request #634 from reactjs/sync-2571aee6

Merge pull request #634 from reactjs/sync-2571aee6 #612