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

Merge pull request #167 from reactjs/sync-84a56968 #310