This fix is in living memory of paroneayea
Merge branch 'master' into bugfix/branch-mangler