Merge branch 'master' into 1060_swm_suppression
authorThomas Pérennou (Viveris Technologie) <thomas.perennou@external.thalesgroup.com>
Wed, 18 Feb 2015 16:25:10 +0000 (17:25 +0100)
committerThomas Pérennou (Viveris Technologie) <thomas.perennou@external.thalesgroup.com>
Wed, 18 Feb 2015 16:25:10 +0000 (17:25 +0100)

Trivial merge