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