merge accepted
authorLaurent Mazet <laurent.mazet@thalesgroup.com>
Mon, 23 May 2016 14:58:02 +0000 (16:58 +0200)
committerLaurent Mazet <laurent.mazet@thalesgroup.com>
Mon, 23 May 2016 14:58:02 +0000 (16:58 +0200)

Trivial merge