Merge pull request #127 from reactjs/sync-2da4f7fb

Merge pull request #127 from reactjs/sync-2da4f7fb #258