git shortcuts
Merge branch 'master' into work-env