Merge pull request #607 from reactjs/sync-b22cbc3f

Merge pull request #607 from reactjs/sync-b22cbc3f #551