Backport (with modification) of 8226ea6a58e63cb8f51780d5bc0e9a0df405c3e8 from !184 Signed-off-by: Christophe Bedard <bedard.christophe@gmail.com> Fix paths