Merge pull request #137 from reactjs/sync-b1a249d5

Merge pull request #137 from reactjs/sync-b1a249d5 #262