Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2017-07-18-2' into...