merge develop -D org -I include -E exclude: PR 369 (Cpp: Correct content and markup)
merge develop -D org -I include -E exclude: PR 437 (Generate PDF using XeLaTeX)
merge develop -D org -I include -E exclude: PR 450 (omero: Python 2.6 is the minimum supported version)