Add in extra delays and a omero server restart
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 1419 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1420 (Feature 998 hyperlinks in descriptions develop)
merge develop -D org -I include -E exclude: PR 1421 (Import as bug develop)
merge develop -D org -I include -E exclude: PR 1426 (Exit with non zero return code if a Matlab training example fails (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1428 (fix #11266: make name field in create-container dialog single-line (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 1412 rleigh-dundee 'Make JDK 1.6 the minimum supported version'
  # PR 1418 rleigh-dundee 'Use Python 2.6 features unconditionally'
  # PR 1419 snoopycrimecop 'Update develop submodules'
  # PR 1420 jburel 'Feature 998 hyperlinks in descriptions develop'
  # PR 1421 jburel 'Import as bug develop'
  # PR 1426 sbesson 'Exit with non zero return code if a Matlab training example fails (rebased onto develop)'
  # PR 1428 mtbc 'fix #11266: make name field in create-container dialog single-line (rebased onto develop)'

Repository: openmicroscopy/bioformats
Updating 5c31090..1f0252e
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 640 rleigh-dundee 'cpp: Add initial C++ implementation'
  # 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 660 rleigh-dundee 'test-build: Build sphinx docs'
  # PR 662 melissalinkert 'Fix SAX handler implementations to prevent value truncation'
  # PR 665 hflynn 'Synchronize docs with LOCI Bio-Formats content (rebased onto develop)'
  # PR 669 rleigh-dundee 'jai: Convert to valid UTF-8'
  # PR 671 sbesson 'Matlab developer documentation page update (rebased onto develop)'

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 437 rleigh-dundee 'Generate PDF using XeLaTeX'
  # PR 448 ximenesuk 'Managed repository'
  # PR 450 rleigh-dundee 'omero: Python 2.6 is the minimum supported version'

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