Merged Flow's XMPPConnection changes