Merge pull request #136 from reactjs/sync-427f24d6

Merge pull request #136 from reactjs/sync-427f24d6 #387