Merge pull request #832 from nupplaphil/feature/basepath/hostname_config