Merge pull request #352 from reactjs/sync-84a56968

Merge pull request #352 from reactjs/sync-84a56968 #334