merge develop -D org -I include -E exclude: PR 991 (Add support for Ice 3.5 (develop))
merge develop -D org -I include -E exclude: PR 1132 (Repository API)
merge develop -D org -I include -E exclude: PR 1168 (fix #10811: add templatePrefix to Fileset)
merge develop -D org -I include -E exclude: PR 1200 (Fake screen ome)
merge develop -D org -I include -E exclude: PR 1219 (Submit failure)
merge develop -D org -I include -E exclude: PR 1223 (11000 companion constraints)
merge develop -D org -I include -E exclude: PR 1227 (OMERO.matlab: add functions to write and link file annotations (see #10385) (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1228 (add note in mapping file about checksum documentation)
merge develop -D org -I include -E exclude: PR 1231 (Move delete mif)
merge develop -D org -I include -E exclude: PR 1232 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1235 (fix #10890: extend blitz preprocessor to containers)
merge develop -D org -I include -E exclude: PR 1240 (script_utils.getObjects() sorts by IDs develop)
merge develop -D org -I include -E exclude: PR 1243 (Use btm prepared statement cache (See #11033))
merge develop -D org -I include -E exclude: PR 1244 (Do not enter interactive mode if hql command output is piped)
merge develop -D org -I include -E exclude: PR 1246 (Spw thumbs 10827 develop)
merge develop -D org -I include -E exclude: PR 1247 (Provide SYSTEM priority thread executor for reload (See #11033))
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 991 rleigh-dundee 'Add support for Ice 3.5 (develop)'
  # PR 1132 knabar 'Repository API'
  # PR 1168 mtbc 'fix #10811: add templatePrefix to Fileset'
  # PR 1200 qidane 'Fake screen ome'
  # PR 1219 jburel 'Submit failure'
  # PR 1223 joshmoore '11000 companion constraints'
  # PR 1227 sbesson 'OMERO.matlab: add functions to write and link file annotations (see #10385) (rebased onto develop)'
  # PR 1228 mtbc 'add note in mapping file about checksum documentation'
  # PR 1231 jburel 'Move delete mif'
  # PR 1232 snoopycrimecop 'Update develop submodules'
  # PR 1235 mtbc 'fix #10890: extend blitz preprocessor to containers'
  # PR 1240 will-moore 'script_utils.getObjects() sorts by IDs develop'
  # PR 1243 joshmoore 'Use btm prepared statement cache (See #11033)'
  # PR 1244 sbesson 'Do not enter interactive mode if hql command output is piped'
  # PR 1246 will-moore 'Spw thumbs 10827 develop'
  # PR 1247 joshmoore 'Provide SYSTEM priority thread executor for reload (See #11033)'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 529 melissalinkert 'Still more bug fixes'
  # PR 534 melissalinkert 'Revert "MetadataTools: Remove deprecated and unused methods"'
  # PR 537 melissalinkert 'Consolidate OME-XML primitive type logging'
  # PR 540 melissalinkert 'Fake screens'
  # PR 541 melissalinkert 'Adjust logging of setId'

Repository: ome/scripts
Already up-to-date.
Merged PRs:
  # PR 31 will-moore 'Don't allow jpeg export of Big images'

Repository: openmicroscopy/ome-documentation
Updating f586c0c..f9df54e
Merged PRs:
  # PR 369 rleigh-dundee 'Cpp: Correct content and markup'
  # PR 382 hflynn 'Updating downloads links & config'
Conflicting PRs (not included):
  # PR 383 hflynn 'Updating User index page & demo server for FS'