Merge pull request #178 from reactjs/sync-d271a7ac

Merge pull request #178 from reactjs/sync-d271a7ac #360