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