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 502 (Fix list of Annotations (rebased onto develop))