Merge pull request #313 from reactjs/sync-69edd845

Merge pull request #313 from reactjs/sync-69edd845 #231