merge develop -D org -I include -E exclude: PR 369 (Cpp: Correct content and markup)
merge develop -D org -I include -E exclude: PR 433 (Minor tidying (rebased onto develop))