Merge pull request #561 from reactjs/sync-366b5fbd

Merge pull request #561 from reactjs/sync-366b5fbd #460