Merge branch 'master' into bash-git