Merge pull request #890 from reactjs/sync-2534424e

Merge pull request #890 from reactjs/sync-2534424e #1114