Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-20150522' into...