merge develop -D org: PR 2240 (Search image id 12151)
merge develop -D org: PR 2256 (Tablet drag handling)
merge develop -D org: PR 2258 (Truncate js tree dynamically 12161)
merge develop -D org: PR 2268 (Remove last file annotation)
merge develop -D org: PR 2269 (ROI improvements)
merge develop -D org: PR 2270 (Disk space 12126)
merge develop -D org: PR 2291 (Zoom display)
merge develop -D org: PR 2304 (Remove group during import (rebased onto develop))
merge develop -D org: PR 2305 (Birdeyeview bugs)
merge develop -D org: PR 2308 (remove erroneous bitsize update)
merge develop -D org: PR 2311 (Fix for 11674 - script doc links (rebased onto develop))
merge develop -D org: PR 2318 (OMERO.matlab: add argument to retrieve annotation by owner (rebased onto develop))
merge develop -D org: PR 2325 (Added pythonpath to omero admin diagnostics.)
merge develop -D org: PR 2326 (Adding contributing docs (rebased onto develop))
merge develop -D org: PR 2327 (CLI download improvements (rebased onto develop))
merge develop -D org: PR 2328 (Change CLI naming options (rebased))
merge develop -D org: PR 2329 (Passes channel configuration to Make_Movie (see #12036) (rebased onto develop))
merge develop -D org: PR 2331 (Flake8 cleanup on omeroweb/webstart)
merge develop -D org

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2301 mtbc 'fix #12193: replace FilesetVersionInfo with map property on Fileset' (label: breaking)
  # PR 2182 joshmoore 'Read only flag' (label: exclude)
  # PR 2127 dpwrussell 'Working view to email announcements to selected users, groups, email addresses and/or all users' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 2240 will-moore 'Search image id 12151'
  # PR 2256 will-moore 'Tablet drag handling'
  # PR 2258 will-moore 'Truncate js tree dynamically 12161'
  # PR 2268 dominikl 'Remove last file annotation'
  # PR 2269 dominikl 'ROI improvements'
  # PR 2270 will-moore 'Disk space 12126'
  # PR 2291 aleksandra-tarkowska 'Zoom display'
  # PR 2304 jburel 'Remove group during import (rebased onto develop)'
  # PR 2305 aleksandra-tarkowska 'Birdeyeview bugs'
  # PR 2308 mtbc 'remove erroneous bitsize update'
  # PR 2311 hflynn 'Fix for 11674 - script doc links (rebased onto develop)'
  # PR 2318 sbesson 'OMERO.matlab: add argument to retrieve annotation by owner (rebased onto develop)'
  # PR 2325 kennethgillen 'Added pythonpath to omero admin diagnostics.'
  # PR 2326 hflynn 'Adding contributing docs (rebased onto develop)'
  # PR 2327 sbesson 'CLI download improvements (rebased onto develop)'
  # PR 2328 ximenesuk 'Change CLI naming options (rebased)'
  # PR 2329 jburel 'Passes channel configuration to Make_Movie (see #12036) (rebased onto develop)'
  # PR 2331 knabar 'Flake8 cleanup on omeroweb/webstart'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 978 berl 'Add writing of .v3draw format for easy loading with Vaa3D.' (user: berl)
  # PR 1049 melissalinkert 'DICOM: fix file grouping so that path names are normalized (rebased onto develop)' (status: error)
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 1054 qidane 'Additional annotation points throughout the model' (label: exclude)
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files'
  # PR 858 melissalinkert 'Initial support for Veeco AFM data'
  # PR 981 melissalinkert 'Ignore namespaces when filling in an XMLAnnotation's Value'
  # PR 983 melissalinkert 'Woolz: make sure the service is initialized when calling openBytes (rebased onto develop)'
  # PR 999 melissalinkert 'Fix for single channel  meas_mode 13 data (rebased onto develop)'
  # PR 1014 bpindelski 'Add initial structure for decompressing JPEG XR images (assist #8493).'
  # PR 1028 melissalinkert 'Large fileset performance improvements (rebased onto develop)'
  # PR 1029 melissalinkert 'TIFF: adjust optimal tile height if tiles have height of 1 (rebased onto develop)'
  # PR 1030 melissalinkert 'CZI: restrict dimension adjustment (rebased onto develop)'
  # PR 1031 melissalinkert 'Volocity: parse timestamps from .atsf files (rebased onto develop)'
  # PR 1041 melissalinkert 'Minor docs autogen fixes (rebased onto develop)'
  # PR 1042 melissalinkert 'OME-XML package bug-fix (rebased onto develop)'
  # PR 1050 melissalinkert 'Add the series index to the default image name (rebased onto develop)'
  # PR 1053 melissalinkert 'SVS: store the PhysicalSizeX and PhysicalSizeY attributes'
  # PR 1056 rleigh-dundee 'Use ant to build sphinx docs'
  # PR 1057 melissalinkert 'Fix file handle/line ending issues so that tests pass on Windows'
Conflicting PRs (not included):
  # PR 1055 rleigh-dundee 'Fix up Bio-Formats POMs (rebased)'

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

Merged PRs:
  # PR 75 jburel 'Allow passing extra channel rendering options to Make_Movie script (rebased onto develop)'

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 743 sbesson 'Propose redesign of OMERO and Bio-Formats 5.0 CI jobs' (exclude comment)
Updating 235604e..7d1f8ae
Merged PRs (fast-forward):
  # PR 744 rleigh-dundee 'Use ant to build sphinx docs'

Merged PRs:
  # PR 745 sbesson 'OMERO.matlab improvements (rebased onto develop)'
  # PR 747 hflynn 'Removing build commands 'only work for UNIX' from README'

Generated by OMERO-5.1-merge-push#167 (http://ci.openmicroscopy.org/job/OMERO-5.1-merge-push/167/)