Merge pull request #486 from reactjs/sync-6be2b020

Merge pull request #486 from reactjs/sync-6be2b020 #384