Updated for recent changes
hostname should default to the empty string
Merge branch 'master' of https://github.com/digitaltrails/piKam