merge develop -D org -I include -E exclude: PR 363 (Minor fixes reported by Mark (rebased onto develop))