merge develop -D org -I include -E exclude: PR 450 (omero: Python 2.6 is the minimum supported version)
merge develop -D org -I include -E exclude: PR 509 (Fix broken pg_dump command (rebased onto develop))