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 475 (Scc 0.3.10 (rebased onto develop))