fix aliases lookup
Merge branch 'master' into portable