Merge pull request #588 from reactjs/sync-2b2d0f23

Merge pull request #588 from reactjs/sync-2b2d0f23 #458