Merge branch 'Python-2.7.9-goolf-1.7.20' of github.com:npklein/easybuild-easyconfigs into Python-2.7.9-goolf-1.7.20