Reported Man-in-the-middle vulnerability in Smack 4.0.0,4.0.1
http://packetstormsecurity.com/files/127780/smackxmpp-mitm.txt
Not that the latest release of the plugin (1.25) is not affected as it's
still based on Smack 3.x and doesn't use setCustomSSLContext
Merge remote-tracking branch 'origin/master' into flow

Conflicts:
	pom.xml