Merged pull request #212 from dajhorn/hostid.