Merge pull request #717 from reactjs/sync-152a471a

Merge pull request #717 from reactjs/sync-152a471a #826