Merge pull request #829 from reactjs/sync-f6d762cb

Merge pull request #829 from reactjs/sync-f6d762cb #964