Upgrade to upstream version 1.5
Merge branch 'v1.5'

Conflicts:
	jabber.py