Update from Upstream

Closes tigertext/xmpp#1343