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 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 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 2612 (Add wsgi.py for OMERO.web (develop))
merge develop -D org: PR 2624 (nginx config template improvement)
merge develop -D org: PR 2686 (clear sessions)
merge develop -D org: PR 2688 (Use a global HDF5 lock (trac: 10464))
merge develop -D org: PR 2691 (Tag import (rebased onto develop))
merge develop -D org: PR 2694 (Fix hover for .tablesorter (see Basket))
merge develop -D org: PR 2709 (Intensity view add (rebased onto develop))
merge develop -D org: PR 2713 (Append linux to the Linux OMERO clients (rebased onto develop))
merge develop -D org: PR 2714 (expose some @Override annotations (rebased from dev_5_0))
merge develop -D org

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2683 sbesson 'Also mark TestTables.testErrorInGet as xfail (rebased onto develop)' (label: exclude)
  # PR 2715 joshmoore 'Don't swallow error on startup (rebased onto develop)' (status: failure)
  # PR 2585 aleksandra-tarkowska 'making time_zone and first_day_of_week configurable' (exclude comment)
  # PR 2403 aleksandra-tarkowska 'Send email' (label: breaking)
  # PR 2363 dominikl 'Java Gateway API' (label: breaking)
  # PR 2182 joshmoore 'Read only flag' (label: exclude)
  # PR 2412 qidane 'Extra annotations' (exclude comment)
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 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 2550 dominikl 'Avoid upscaling of bird's eye image'
  # PR 2560 will-moore 'for-loop fix removes 'undefined' from reset dialog. See #12301'
  # PR 2612 chris-allan 'Add wsgi.py for OMERO.web (develop)'
  # PR 2624 aleksandra-tarkowska 'nginx config template improvement'
  # PR 2686 aleksandra-tarkowska 'clear sessions'
  # PR 2688 manics 'Use a global HDF5 lock (trac: 10464)'
  # PR 2691 jburel 'Tag import (rebased onto develop)'
  # PR 2694 PaulVanSchayck 'Fix hover for .tablesorter (see Basket)'
  # PR 2709 jburel 'Intensity view add (rebased onto develop)'
  # PR 2713 sbesson 'Append linux to the Linux OMERO clients (rebased onto develop)'
  # PR 2714 mtbc 'expose some @Override annotations (rebased from dev_5_0)'
Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files' (label: exclude)
  # PR 1161 sommerc 'Initial CellH5 Reader class' (user: sommerc)
  # PR 1136 melissalinkert 'Add initial support for reading BinaryOnly OME-TIFF datasets (rebased onto develop)' (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 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
  # PR 1177 rleigh-dundee 'specification: Add metadata for HDF5 embedding' (exclude comment)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 1141 LeeKamentsky 'Reader for Amaris FlowSight .cif format' (label: exclude)
  # PR 858 melissalinkert 'Initial support for Veeco AFM data' (label: exclude)
Updating da7d745..c2a72ee
Merged PRs (fast-forward):
  # PR 1162 melissalinkert 'AFI: populate magnification and physical pixel size metadata'
  # PR 1185 hflynn 'Fixing imglib scifio github link (rebased onto develop)'

Merged PRs:
  # PR 983 melissalinkert 'Woolz: make sure the service is initialized when calling openBytes (rebased onto develop)'
  # PR 1123 melissalinkert 'Add a reader that accepts a file containing a file pattern'
  # PR 1154 melissalinkert 'Leica: prevent exception when linking EmissionFilter'
  # PR 1164 melissalinkert 'Add modulo support for LI-FLIM data'
  # PR 1178 melissalinkert 'Nikon .nd2 fixes, part 2 (rebased onto develop)'
  # PR 1181 sbesson 'bfsave: metadata improvements (rebased onto develop)'
  # PR 1187 melissalinkert 'ScanR: fix exposure time units'
Repository: ome/scripts
Already up-to-date.

Merged PRs:
  # PR 85 hflynn 'Update batch image export tutorial link'
Repository: openmicroscopy/ome-documentation
Updating 3656f6a..81205bb
Merged PRs (fast-forward):
  # PR 837 joshmoore 'Add mention of 'Protocol' failure for IPv6 (rebased onto develop)'

Merged PRs:
  # PR 799 manics 'Linux walkthrough (rebased onto develop)'
  # PR 824 sbesson 'OME DCO'
  # PR 827 aleksandra-tarkowska 'Nginx doc'
  # PR 834 aleksandra-tarkowska 'Session engine'
Generated by OMERO-5.1-merge-push#310 (http://ci.openmicroscopy.org/job/OMERO-5.1-merge-push/310/)