Merge trulabs fork and XEP-0012 from unisontech.