merge develop -D org -I include -E exclude: PR 512 (xsd-fu: Extend C++ support to generate headers and include guards)
merge develop -D org -I include -E exclude: PR 521 (Assorted bug fixes for May)