Merge branch 'master' of github.com:sylmarien/easybuild-config
Merge branch 'master' of github.com:sylmarien/easybuild-config