sync with develop

mergability of https://github.com/hpcugent/easybuild-easyconfigs/pull/1079 is broken, not sure why since there are no conflicts, but this should fix it...