Merge pull request #171 from reactjs/sync-366b5fbd

Merge pull request #171 from reactjs/sync-366b5fbd #345