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 2336 (New tagging dialog)
merge develop -D org: PR 2362 (Remove .jy from script names)
merge develop -D org: PR 2391 (Imagej omero (rebased onto develop))
merge develop -D org: PR 2411 (Update develop submodules)
merge develop -D org: PR 2435 (cpp: RTypesI: use static locals in place of duplicated globals)
merge develop -D org: PR 2521 (Add 'config list' command)
merge develop -D org: PR 2536 (Only enable the filepath icon if there are any filepaths to show)
merge develop -D org: PR 2550 (Avoid upscaling of bird's eye image)
merge develop -D org: PR 2560 (for-loop fix removes 'undefined' from reset dialog. See #12301)
merge develop -D org: PR 2562 (Rendering settings: Always show 'SavedBy' Panel)
merge develop -D org: PR 2564 (Top links 12326)
merge develop -D org: PR 2580 (Remove 'batch_search'. See #12347)
merge develop -D org: PR 2583 (12358 parse metadata)
merge develop -D org: PR 2612 (Add wsgi.py for OMERO.web (develop))
merge develop -D org: PR 2624 (nginx config template improvement)
merge develop -D org: PR 2656 (In place fixes (rebased onto develop))
merge develop -D org: PR 2657 (#12323 mousewheel)
merge develop -D org

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2585 aleksandra-tarkowska 'making time_zone and first_day_of_week configurable' (exclude comment)
  # PR 2412 qidane 'Extra annotations' (exclude comment)
  # PR 2363 dominikl 'Java Gateway API' (label: breaking)
  # PR 2403 aleksandra-tarkowska 'Send email' (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 2336 knabar 'New tagging dialog'
  # PR 2362 will-moore 'Remove .jy from script names'
  # PR 2391 jburel 'Imagej omero (rebased onto develop)'
  # PR 2411 snoopycrimecop 'Update develop submodules'
  # PR 2435 rleigh-dundee 'cpp: RTypesI: use static locals in place of duplicated globals'
  # PR 2521 joshmoore 'Add 'config list' command'
  # PR 2536 dominikl 'Only enable the filepath icon if there are any filepaths to show'
  # PR 2550 dominikl 'Avoid upscaling of bird's eye image'
  # PR 2560 will-moore 'for-loop fix removes 'undefined' from reset dialog. See #12301'
  # PR 2562 dominikl 'Rendering settings: Always show 'SavedBy' Panel'
  # PR 2564 will-moore 'Top links 12326'
  # PR 2580 will-moore 'Remove 'batch_search'. See #12347'
  # PR 2583 joshmoore '12358 parse metadata'
  # PR 2612 chris-allan 'Add wsgi.py for OMERO.web (develop)'
  # PR 2624 aleksandra-tarkowska 'nginx config template improvement'
  # PR 2656 joshmoore 'In place fixes (rebased onto develop)'
  # PR 2657 aleksandra-tarkowska '#12323 mousewheel'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1141 LeeKamentsky 'Reader for Amaris FlowSight .cif format' (label: exclude)
  # PR 1161 sommerc 'Initial CellH5 Reader class' (user: sommerc)
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files' (label: exclude)
  # PR 1054 qidane 'Additional annotation points throughout the model' (exclude comment)
  # PR 978 berl 'Add writing of .v3draw format for easy loading with Vaa3D.' (user: berl)
  # PR 1123 melissalinkert 'Add a reader that accepts a file containing a file pattern' (label: exclude)
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 1136 melissalinkert 'Add initial support for reading BinaryOnly OME-TIFF datasets (rebased onto develop)' (label: exclude)
  # PR 1162 melissalinkert 'AFI: populate magnification and physical pixel size metadata' (status: failure)
  # PR 858 melissalinkert 'Initial support for Veeco AFM data' (label: exclude)
Already up-to-date.

Merged PRs:
  # 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 1138 melissalinkert 'Lots of Zeiss CZI fixes (rebased onto develop)'
  # PR 1154 melissalinkert 'Leica: prevent exception when linking EmissionFilter'
  # PR 1155 joshmoore 'Memoizer errs (rebased onto develop)'
  # PR 1163 melissalinkert 'Fix for BH .Sdt meas mode 0 & 1 single pixel files & (unrelated) problem with dividing by increment count. (rebased onto develop)'
  # PR 1164 melissalinkert 'Add modulo support for LI-FLIM data'
  # PR 1165 melissalinkert 'First round of Nikon ND2 fixes (rebased onto develop)'
  # PR 1166 mtbc 'assist #12385: use ArrayList instead of Vector'

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

Repository: openmicroscopy/ome-documentation
Updating 06efc89..68ef5ce
Merged PRs (fast-forward):
  # PR 828 sbesson 'Search page tidying up (rebased onto develop)'
  # PR 829 sbesson 'OMERO Developer doc tidying (rebased onto develop)'

Merged PRs:
  # PR 799 manics 'Linux walkthrough (rebased onto develop)'
  # PR 824 sbesson 'OME DCO'
Conflicting PRs (not included):
  # PR 827 aleksandra-tarkowska 'Nginx doc'

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