Merge branch 'ak/git-pm-typofix'