MARGERY David authored Jun 12, 2017 and Florent Didier committed Jun 21, 2017

This is to reduce diff to lnussbaum/jessie-rebased
(e698119d6dd76ba5b9c30336c69f58bc85e3ec8a) as much a possible
to understand more precisely the differences between the v3 branch and
the development branch