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