Merge pull request #1109 from reactjs/sync-a5181c29

Merge pull request #1109 from reactjs/sync-a5181c29 #1048