Merge branch 'master' into unsigned2size_t

Resolve conflicts in
	types/data_grid_bathy.h
	types/test/datagrid_test.cc