Merge hydro-devel into indigo-devel

Conflicts:
	.travis.yml