Add squash and stash helpers
Merge branch 'master' into work

* master:
  Add squash and stash helpers

Conflicts:
	.gitconfig