Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2018-02-21-2' into...