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

Merge pull request #659 from reactjs/sync-2534424e #687