Merge pull request #127 from reactjs/sync-49284218

Merge pull request #127 from reactjs/sync-49284218 #246