Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-2017-01-11-2...