Merge pull request #353 from reactjs/sync-d52b3ec7

Merge pull request #353 from reactjs/sync-d52b3ec7 #346