Merge pull request #152 from reactjs/sync-2859efa0

Merge pull request #152 from reactjs/sync-2859efa0 #305