Merge pull request #539 from reactjs/sync-f6d762cb

Merge pull request #539 from reactjs/sync-f6d762cb #418