Git: Add the restash alias
Merge branch 'master' into atlassian