Merge pull request #529 from reactjs/sync-d271a7ac

Merge pull request #529 from reactjs/sync-d271a7ac #366