Merge pull request #165 from reactjs/sync-abe931a8

Merge pull request #165 from reactjs/sync-abe931a8 #266