Merge pull request #577 from reactjs/sync-2da4f7fb

Merge pull request #577 from reactjs/sync-2da4f7fb #488