fix aliases
Merge branch 'master' into rpm-based-releases