Merge branch 'develop' of github.com:hpcugent/easybuild-easyconfigs into 20160604152959_new_pr_ParaView440