Merged in bonjour-rename-xmpp (pull request #610)

2019-10-26, Gary Kramlich