Merge pull request #137 from reactjs/sync-7c90c6eb

Merge pull request #137 from reactjs/sync-7c90c6eb #389