Merge pull request #436 from reactjs/sync-d34c6a2c

Merge pull request #436 from reactjs/sync-d34c6a2c #295