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

Merge pull request #145 from reactjs/sync-2859efa0 #272