more reliable and consistent hostname lookup
Merge branch 'aliasing'