This is 0.3.0e
Merge branch 'dev' into xmpp-muc