Merge branch 'develop' into pr400

Conflicts:
	easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs.eb
	easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13.eb
	easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-5.3.0-gpfs.eb
	easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-5.3.0.eb
	easybuild/easyconfigs/h/HDF5/HDF5-1.8.7-goolf-1.4.10.eb
	easybuild/easyconfigs/h/HDF5/HDF5-1.8.9-goolf-1.4.10.eb
	easybuild/easyconfigs/h/HDF5/HDF5-1.8.9-ictce-4.1.13.eb
	easybuild/easyconfigs/h/HDF5/HDF5-1.8.9-ictce-5.3.0.eb