merge develop -D org: PR 2127 (Working view to email announcements to selected users, groups, email addresses and/or all users)
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 2304 (Remove group during import (rebased onto develop))
merge develop -D org: PR 2305 (Birdeyeview bugs)
merge develop -D org: PR 2311 (Fix for 11674 - script doc links (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 2335 (Remove settings (rebased onto develop))
merge develop -D org: PR 2341 (build: release-docs: Use ant to build sphinx documentation)
merge develop -D org: PR 2346 (Flake8 cleanup of omeroweb/webredirect)
merge develop -D org: PR 2347 (default script value (rebased onto develop))
merge develop -D org: PR 2350 (Travis check for Python imports in OmeroWeb)
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)
Already up-to-date.

Merged PRs:
  # PR 2127 dpwrussell 'Working view to email announcements to selected users, groups, email addresses and/or all users'
  # 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 2304 jburel 'Remove group during import (rebased onto develop)'
  # PR 2305 aleksandra-tarkowska 'Birdeyeview bugs'
  # PR 2311 hflynn 'Fix for 11674 - script doc links (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 2335 jburel 'Remove settings (rebased onto develop)'
  # PR 2341 rleigh-dundee 'build: release-docs: Use ant to build sphinx documentation'
  # PR 2346 knabar 'Flake8 cleanup of omeroweb/webredirect'
  # PR 2347 jburel 'default script value (rebased onto develop)'
  # PR 2350 knabar 'Travis check for Python imports in OmeroWeb'
Conflicting PRs (not included):
  # PR 2336 knabar 'New tagging dialog'
  # PR 2348 knabar 'Flake8 cleanup of omeroweb/webadmin'
  # PR 2349 chris-allan 'OMERO.web unit and integration test fixes (develop)'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1054 qidane 'Additional annotation points throughout the model' (label: exclude)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI' (label: exclude)
Updating e852f90..d97fd41
Merged PRs (fast-forward):
  # PR 1014 bpindelski 'Add initial structure for decompressing JPEG XR images (assist #8493).'

Merged PRs:
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files'
  # PR 858 melissalinkert 'Initial support for Veeco AFM data'
  # PR 978 berl 'Add writing of .v3draw format for easy loading with Vaa3D.'
  # 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 1028 melissalinkert 'Large fileset performance improvements (rebased onto develop)'
  # PR 1049 melissalinkert 'DICOM: fix file grouping so that path names are normalized (rebased onto develop)'
  # PR 1055 rleigh-dundee 'Fix up Bio-Formats POMs (rebased)'
  # PR 1057 melissalinkert 'Fix file handle/line ending issues so that tests pass on Windows'
  # PR 1060 melissalinkert 'Allow dist-matlab to run on Windows'
  # PR 1063 melissalinkert 'Micromanager fixes (rebased onto develop)'
  # PR 1065 sbesson 'Update auto-generated documentation'

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)
Already up-to-date.

Merged PRs:
  # PR 745 sbesson 'OMERO.matlab improvements (rebased onto develop)'
  # PR 750 rleigh-dundee 'ant: Set SOURCE_BRANCH and OMERO_RELEASE using omero.shortversion'
Conflicting PRs (not included):
  # PR 752 rleigh-dundee 'ant: Support API doc generation'

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