Merge pull request #66 from PierreSmits/DIRSTUDIO-1317-Improve-CI

Dirstudio 1317 improve ci