Merge remote-tracking branch 'origin/master'
authorLaurent Mazet <laurent.mazet@thalesgroup.com>
Wed, 11 Feb 2015 14:41:57 +0000 (15:41 +0100)
committerLaurent Mazet <laurent.mazet@thalesgroup.com>
Wed, 11 Feb 2015 14:41:57 +0000 (15:41 +0100)

Trivial merge