Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2019-07-25-1' into...