Merge remote-tracking branch 'origin/dev_tr65_tpe_1060_swm_suppression'
authorLaurent Mazet <laurent.mazet@thalesgroup.com>
Mon, 15 Jun 2015 09:54:20 +0000 (11:54 +0200)
committerLaurent Mazet <laurent.mazet@thalesgroup.com>
Mon, 15 Jun 2015 09:54:20 +0000 (11:54 +0200)

Trivial merge