merge develop -D org -I include -E exclude: PR 1324 (Jython scripts (See #918))
merge develop -D org -I include -E exclude: PR 1359 (testGetTile() checks against getPlane(). See #11315)
merge develop -D org -I include -E exclude: PR 1385 (Update the OMERO VirtualBox image)
merge develop -D org -I include -E exclude: PR 1389 (Add tag CLI plugin work (gs-985))
merge develop -D org -I include -E exclude: PR 1418 (Use Python 2.6 features unconditionally)
merge develop -D org -I include -E exclude: PR 1421 (Import as bug develop)
merge develop -D org -I include -E exclude: PR 1441 (Don't use omero.group=-1 when not required (Fixes #11427))
merge develop -D org -I include -E exclude: PR 1452 (Update log4j jar.)
merge develop -D org -I include -E exclude: PR 1465 (Omeroweb examples fixes develop)
merge develop -D org -I include -E exclude: PR 1466 (plate_thumbs_11160_develop)
merge develop -D org -I include -E exclude: PR 1495 (fix #9934: adjust query options once pagination is done (rebased))
merge develop -D org -I include -E exclude: PR 1498 (Import delete dataset (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1503 (Robot structure (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1504 (Training java (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1510 (Copy 11194 and well hierarchy 10075 develop)
merge develop -D org -I include -E exclude: PR 1511 (Single ch split 2923 lineplot 2924 develop)
merge develop -D org -I include -E exclude: PR 1515 (Python integration test fixes and introduction of pytest (rebased on develop))
merge develop -D org -I include -E exclude: PR 1516 (Make the OMERO.server autostart on Windows (see #11448) (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1517 (Disappearing plate (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1518 (Increase passing tests in OmeroJava (rebased onto develop))