fix #11371: delete script instead of whole script directory
Update log4j jar.
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 1412 (Make JDK 1.6 the minimum supported version)
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 1435 (fix #11401: remove deleted tree nodes from set of selected nodes (rebase))
merge develop -D org -I include -E exclude: PR 1440 (Disable location stats calculation for big images (Fixes #11420))
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 1442 (fix #10561: make user object getting robust to no experimenter in tree (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1443 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1448 (fix #11371: adjust script delete to target specific script file name (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1452 (Update log4j jar.)
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 1324 joshmoore 'Jython scripts (See #918)'
  # PR 1359 will-moore 'testGetTile() checks against getPlane(). See #11315'
  # PR 1385 manics 'Update the OMERO VirtualBox image'
  # PR 1389 criswell 'Add tag CLI plugin work (gs-985)'
  # PR 1412 rleigh-dundee 'Make JDK 1.6 the minimum supported version'
  # PR 1418 rleigh-dundee 'Use Python 2.6 features unconditionally'
  # PR 1421 jburel 'Import as bug develop'
  # PR 1435 mtbc 'fix #11401: remove deleted tree nodes from set of selected nodes (rebase)'
  # PR 1440 chris-allan 'Disable location stats calculation for big images (Fixes #11420)'
  # PR 1441 chris-allan 'Don't use omero.group=-1 when not required (Fixes #11427)'
  # PR 1442 mtbc 'fix #10561: make user object getting robust to no experimenter in tree (rebased onto develop)'
  # PR 1443 snoopycrimecop 'Update develop submodules'
  # PR 1448 mtbc 'fix #11371: adjust script delete to target specific script file name (rebased onto develop)'
  # PR 1452 ximenesuk 'Update log4j jar.'

Repository: openmicroscopy/bioformats
Updating 59c9375..72c8e09
Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 635 melissalinkert 'Use jgit-buildnumber to set version information in Maven'
  # PR 643 melissalinkert 'Data test updates'
  # PR 644 melissalinkert 'Add support for writing ModuloAlong* annotations'
  # PR 646 melissalinkert 'Save current revision number in memo file'
  # PR 684 melissalinkert 'AVI: fix byte count when skipping rows'
  # PR 685 sbesson 'Downloads page: use PDF artifact'
  # PR 686 melissalinkert 'CellWorx: do not assume that the first well/field file exists (rebased onto develop)'
  # PR 687 rleigh-dundee 'Deliberately change generated code comments'
  # PR 689 rleigh-dundee 'Initial C++ implementation'

Repository: ome/scripts
Already up-to-date.

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 450 rleigh-dundee 'omero: Python 2.6 is the minimum supported version'
  # PR 462 mtbc 'Adjusted titles of continuous integration developer pages (rebased onto develop)'

Generated by OMERO-merge-develop#406 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-develop/406/)