Merge branch 'develop' into clang

Conflicts:
	easybuild/easyconfigs/i/iccifort/iccifort-2011.13.367.eb
	easybuild/easyconfigs/i/ictce/ictce-3.2.2.u3-32bit.eb
	easybuild/easyconfigs/i/ictce/ictce-3.2.2.u3.eb
	easybuild/easyconfigs/i/ictce/ictce-4.0.10.eb
	easybuild/easyconfigs/i/ictce/ictce-4.0.6.eb
	easybuild/easyconfigs/i/ictce/ictce-4.1.13.eb
	easybuild/easyconfigs/i/ictce/ictce-5.1.1.eb
	easybuild/easyconfigs/i/ictce/ictce-5.2.0.eb
	easybuild/easyconfigs/i/imkl/imkl-10.2.6.038-32bit.eb
	easybuild/easyconfigs/i/imkl/imkl-10.2.6.038.eb
	easybuild/easyconfigs/i/imkl/imkl-10.3.10.319.eb
	easybuild/easyconfigs/i/imkl/imkl-10.3.12.361-OpenMPI-1.6.3.eb
	easybuild/easyconfigs/i/imkl/imkl-10.3.12.361.eb
	easybuild/easyconfigs/i/imkl/imkl-10.3.6.233.eb
	easybuild/easyconfigs/i/imkl/imkl-11.0.1.117.eb
	easybuild/easyconfigs/i/imkl/imkl-11.0.2.146.eb
	easybuild/easyconfigs/i/impi/impi-4.0.0.028-32bit.eb
	easybuild/easyconfigs/i/impi/impi-4.0.0.028.eb
	easybuild/easyconfigs/i/impi/impi-4.0.2.003.eb
	easybuild/easyconfigs/i/impi/impi-4.1.0.027.eb
	easybuild/easyconfigs/i/impi/impi-4.1.0.030.eb
	easybuild/easyconfigs/i/iomkl/iomkl-4.6.13.eb
	easybuild/easyconfigs/i/ipp/ipp-7.0.5.233.eb
	easybuild/easyconfigs/i/itac/itac-8.0.0.011.eb