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

Merge pull request #205 from reactjs/sync-427f24d6 #419