Merge pull request #144 from reactjs/sync-2da4f7fb

Merge pull request #144 from reactjs/sync-2da4f7fb #236