Merge branch wip/julien.lacoste/fixBuildError with refs/heads/master into...
Merge branch wip/julien.lacoste/fixBuildError with refs/heads/master into refs/merge-requests/542/train
Merge branch wip/julien.lacoste/fixBuildError with refs/heads/master into refs/merge-requests/542/train