Merge pull request #672 from reactjs/sync-8bb31acb

Merge pull request #672 from reactjs/sync-8bb31acb #603