Merge pull request #1412 from rleigh-dundee/java6-minversion

Make JDK 1.6 the minimum supported version
Merge pull request #1443 from snoopycrimecop/merge/develop/submodules

Update develop submodules
fix spelling of "attachment"
add link method from -private
Update develop submodules
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 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 1448 (fix #11371: adjust script delete to target specific script file name (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1458 (fix spelling of "attachment" (rebased onto develop))
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 1418 rleigh-dundee 'Use Python 2.6 features unconditionally'
  # PR 1421 jburel 'Import as bug develop'
  # 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 1448 mtbc 'fix #11371: adjust script delete to target specific script file name (rebased onto develop)'
  # PR 1458 mtbc 'fix spelling of "attachment" (rebased onto develop)'

Repository: openmicroscopy/bioformats
Already up-to-date.
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 684 melissalinkert 'AVI: fix byte count when skipping rows'
  # 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'
  # PR 693 sbesson 'Fix bfGetReader for MATLAB R2009a and earlier (rebased onto develop)'

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)'
  # PR 465 bpindelski 'index.txt: Correct typos on landing page.'

Generated by SCC-merge#340 (http://hudson.openmicroscopy.org.uk/job/SCC-merge/340/)