Merge pull request #673 from reactjs/sync-152a471a

Merge pull request #673 from reactjs/sync-152a471a #607