Merge branch 'develop' of github.com:hpcugent/easybuild-easyconfigs into contrib_macosx_buildable_Lmod