Merge branch 'smack-next-master' into next