don't git-stash when merging etc.
Merge branch 'master' into dev-form