Merge pull request #147 from reactjs/sync-5138e605

Merge pull request #147 from reactjs/sync-5138e605 #274