Merge branch 'develop' of github.com:hpcugent/easybuild-framework into develop
fix bug introduced in reshuffling in #568
Merge branch 'develop' of github.com:hpcugent/easybuild-framework into develop
Merge pull request #574 from boegel/develop

fix bug introduced by reshuffling in #568