merge init
Merge remote-tracking branch 'upstream/master'
Updates to how scopes are handled by default