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