Merge pull request #623 from reactjs/sync-2859efa0

Merge pull request #623 from reactjs/sync-2859efa0 #588