Automatically add/remove '/' when adding and removing aliases
Merge branch 'master' into plugins