sync with develop

This is needed to be able to merge in https://github.com/hpcugent/easybuild-easyconfigs/pull/52