This commit and the previous one should be "jumped" by the build branch. Hopefully.

Signed-off-by: Pierre-Jean Quilleré <pj.quillere@sylights.com>