Modified aliases
Merge branch 'master' of gitproxy:plibauer/aliases