Merge branch 'develop' of github.com:hpcugent/VSC-tools into develop
Merge branch 'master' of github.com:hpcugent/VSC-tools