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 834 (Permit cppwrap failure)
merge develop -D org -I include -E exclude: PR 847 (Fix the copyright statement on generated Javadocs (rebased onto develop))