Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2016-09-19-2' into...