Alias rename
Merge branch 'master' into archlinux