Merge pull request #146 from reactjs/sync-a1ddcf51

Merge pull request #146 from reactjs/sync-a1ddcf51 #240