Merge commit 'bdbc0cbfd0b178916ae8f60ccd6ad047f1d020d5'
This fixes broken sanity checks with Lmod.
Merge branch 'master' of https://github.com/MRCE/easybuild-framework