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 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 1501 (10618 priv thumbs (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 1542 (Blitz integration tests (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1550 (Fix ROI resizing in Insight (see #11384) (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1579 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1581 (Script menu (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1590 (Session uuid fixes (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1597 (Make BfPixelBufferTest run against a remote server. (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1603 (fix #10894: increase realism of test pixel buffer)
merge develop -D org -I include -E exclude: PR 1608 (11395 fixpyramids (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1609 (11462 indexer log (rebased onto develop))