Merge branch 'master' into metadataUtil

Conflicts:
	meta/src/main/java/net/imglib2/meta/DefaultTypedAxis.java
	ops/src/main/java/net/imglib2/ops/operation/metadata/unary/CopyCalibratedSpace.java
	ops/src/main/java/net/imglib2/ops/operation/metadata/unary/CopyMetadata.java
	ui/src/main/java/net/imglib2/ui/PainterThread.java
Merge branch 'metadataUtil' into knip

Conflicts:
	algorithms/core/src/main/java/net/imglib2/algorithm/histogram/BinMapper1d.java
	core/src/main/java/net/imglib2/combiner/read/CombinedCursor.java
	meta/src/main/java/net/imglib2/meta/MetadataUtil.java