Fixes suggested by Roger
merge develop -D org -I include -E exclude: PR 369 (Cpp: Correct content and markup)
merge develop -D org -I include -E exclude: PR 448 (Managed repository)
merge develop -D org -I include -E exclude: PR 449 (Making Java 1.6 minimum version required)