continued work with input from many
Merge branch 'master' of /Users/jocke/Dropbox/Xep/Peters/../XMPP-EXI