Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2017-12-19-1' into...