Merge pull request #569 from reactjs/sync-2534424e

Merge pull request #569 from reactjs/sync-2534424e #474