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

Merge pull request #126 from reactjs/sync-427f24d6 #175