Merge pull request #1096 from reactjs/sync-e07ac94b

Merge pull request #1096 from reactjs/sync-e07ac94b #1007