Fixed issue where aliases weren't being normalized.
Merge remote-tracking branch 'origin/master'