merge develop -D org -I include -E exclude: PR 528 (Tile performance improvements for VMS and NDPI)
merge develop -D org -I include -E exclude: PR 637 (ome-xml: Timestamp: Remove non-joda time ctors and methods)