Merge branch 'develop' of github.com:hpcugent/easybuild-easyconfigs into 20160321205140_new_pr_GLib2475