Code

Merge branch 'vr/git-merge-default-to-upstream'