[qxmpp-dev/f18] (9 commits) ...Merge branch 'f17' into f18