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 1408 (Expose file annotation namespace in the clients (rebased onto develop))
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 1415 (Clean up components/common/test. (rebased onto develop))
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 1419 (Update develop submodules)
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 1408 sbesson 'Expose file annotation namespace in the clients (rebased onto develop)'
  # PR 1412 rleigh-dundee 'Make JDK 1.6 the minimum supported version'
  # PR 1415 bpindelski 'Clean up components/common/test. (rebased onto develop)'
  # PR 1418 rleigh-dundee 'Use Python 2.6 features unconditionally'
  # PR 1419 snoopycrimecop 'Update develop submodules'

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 639 rleigh-dundee 'xsd-fu: Extend C++ support and add extra options'
  # PR 643 melissalinkert 'Data test updates'
  # PR 644 melissalinkert 'Add support for writing ModuloAlong* annotations'
  # PR 645 melissalinkert 'Leica LIF: also parse channel names from FilterSettingRecords (rebased onto develop)'
  # PR 646 melissalinkert 'Save current revision number in memo file'
  # PR 647 rleigh-dundee 'Make JDK 1.6 the minimum supported version'
  # PR 648 melissalinkert 'Java 1.7/Findbugs fixes'
  # PR 651 qidane 'Adding wider search for DOMImplementation'
  # PR 652 rleigh-dundee 'specification: Depend upon xercesImpl'
Conflicting PRs (not included):
  # PR 640 rleigh-dundee 'cpp: Add initial C++ implementation'

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

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 369 rleigh-dundee 'Cpp: Correct content and markup'
  # PR 448 ximenesuk 'Managed repository'
  # PR 449 hflynn 'Making Java 1.6 minimum version required'
Conflicting PRs (not included):
  # PR 450 rleigh-dundee 'omero: Python 2.6 is the minimum supported version'

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