Fix #31 #33

Merged
bmartin5692 merged 7 commits from fix-#31 into dev_broken-XMPP 2019-05-21 16:31:52 +02:00
No description provided.