Merge pull request #887 from reactjs/sync-d271a7ac

Merge pull request #887 from reactjs/sync-d271a7ac #1109