Merge remote-tracking branch 'origin/develop' into omero_session_dir

Conflicts:
	components/tools/OmeroPy/src/omero/cli.py