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

Merge pull request #641 from reactjs/sync-84a56968 #629