One more commit that should be jumped by the build branch :]

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