Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-fixes-20151118-1' into...