[#1985] XMessaging fix
Merge branch 'master' of https://github.com/irods/irods.git