more changes in upstream master
Merge branch 'master' of github.com:logiclocker/git-scratch