Merge branch 'smack-for-4.1' of git://github.com/cschaufler/smack-next into next