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 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 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 1519 (Update batik to 1.8-prerelease (see #11438) (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1524 (Python integration test fixes, pytest and target (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1526 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1529 (6850 loading tile in big image viewer)
merge develop -D org -I include -E exclude: PR 1535 (Rdef slider range 8758 develop)
merge develop -D org -I include -E exclude: PR 1536 (Jnlp 10598 (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1538 (Create image from old 11426 develop)
merge develop -D org -I include -E exclude: PR 1539 (Dmrefresh (rebased onto develop))