shorter/cleaner code#2

boegel merged 3 commits intoboegel:developboegel/easybuild-framework:developfrom

stdweird:boegel_ldstdweird/easybuild-framework:boegel_ldCopy head branch name to clipboard