Merged in efritz/convey/hostnames (pull request #29)

2017-10-04, Gary Kramlich