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 639 (xsd-fu: Extend C++ support and add extra options)
merge develop -D org -I include -E exclude: PR 640 (cpp: Add initial C++ implementation)