merge in develop and fix conflicts blocking PR #240

required for https://github.com/hpcugent/easybuild-easyconfigs/pull/240