Merge pull request #897 from reactjs/sync-e22544e6

Merge pull request #897 from reactjs/sync-e22544e6 #1126