Merge branch 'smack-for-4.5' of https://github.com/cschaufler/smack-next into next