Merge pull request #196 from reactjs/sync-0d05d9b6

Merge pull request #196 from reactjs/sync-0d05d9b6 #350