Merge branch 'next' into i338-field-objects-for-dataset

Conflicts:
	src/ocgis/test/test_simple/test_simple.py