Merge pull request #560 from reactjs/sync-a5181c29

Merge pull request #560 from reactjs/sync-a5181c29 #458