Bugfix.
Merge branches 'master' and 'master' of https://github.com/collective/collective.xmpp.core