Merge pull request #192 from reactjs/sync-50d6991c

Merge pull request #192 from reactjs/sync-50d6991c #686