Merge branch 'master' of github.com:collective/collective.xmpp.chat