Merge pull request #146 from reactjs/sync-abe931a8

Merge pull request #146 from reactjs/sync-abe931a8 #287