Merge pull request #650 from reactjs/sync-a5181c29

Merge pull request #650 from reactjs/sync-a5181c29 #656