Merge from upstream
Merge pull request #668 from github/merge-bhuga-upstream

Merge from upstream