merge develop -D org: PR 2391 (Imagej omero (rebased onto develop))
merge develop -D org: PR 2435 (cpp: RTypesI: use static locals in place of duplicated globals)
merge develop -D org: PR 2560 (for-loop fix removes 'undefined' from reset dialog. See #12301)
merge develop -D org: PR 2747 (Bugfix: Saved by display)
merge develop -D org: PR 2767 (Event log queue (rebased onto develop))
merge develop -D org: PR 2772 (CLI import help changes (rebased onto develop))
merge develop -D org: PR 2778 (12311 auto memory (rebased onto develop))
merge develop -D org: PR 2782 (CLI: additional fake import tests)
merge develop -D org: PR 2791 (preventing from clicking Accept without choosing file annotation (rebased onto develop))
merge develop -D org: PR 2792 (fix #11096: ensure that new %time% directory is unique (rebased from dev_5_0))
merge develop -D org: PR 2794 (OmeroCpp: Drop special casing for Ice 3.3)
merge develop -D org: PR 2795 (Use mklink under Windows (rebased onto develop))
merge develop -D org

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2797 rleigh-dundee 'OmeroCpp: switch build system from scons to cmake' (exclude comment)
  # PR 2403 aleksandra-tarkowska 'Send email' (label: breaking)
  # PR 2760 snoopycrimecop 'Update develop submodules' (status: failure)
  # PR 2585 aleksandra-tarkowska 'making time_zone and first_day_of_week configurable' (exclude comment)
  # PR 2799 joshmoore 'Auto close (rebased onto develop)' (status: failure)
  # PR 2363 dominikl 'Java Gateway API' (label: exclude breaking)
  # PR 2412 qidane 'Extra annotations' (exclude comment)
  # PR 2182 joshmoore 'Read only flag' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 2391 jburel 'Imagej omero (rebased onto develop)'
  # PR 2435 rleigh-dundee 'cpp: RTypesI: use static locals in place of duplicated globals'
  # PR 2560 will-moore 'for-loop fix removes 'undefined' from reset dialog. See #12301'
  # PR 2747 dominikl 'Bugfix: Saved by display'
  # PR 2767 joshmoore 'Event log queue (rebased onto develop)'
  # PR 2772 sbesson 'CLI import help changes (rebased onto develop)'
  # PR 2778 joshmoore '12311 auto memory (rebased onto develop)'
  # PR 2782 sbesson 'CLI: additional fake import tests'
  # PR 2791 aleksandra-tarkowska 'preventing from clicking Accept without choosing file annotation (rebased onto develop)'
  # PR 2792 mtbc 'fix #11096: ensure that new %time% directory is unique (rebased from dev_5_0)'
  # PR 2794 rleigh-dundee 'OmeroCpp: Drop special casing for Ice 3.3'
  # PR 2795 joshmoore 'Use mklink under Windows (rebased onto develop)'
Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1177 rleigh-dundee 'specification: Add metadata for HDF5 embedding' (exclude comment)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
  # PR 858 melissalinkert 'Initial support for Veeco AFM data' (label: exclude)
  # PR 1141 LeeKamentsky 'Reader for Amaris FlowSight .cif format' (label: exclude)
  # PR 1204 rleigh-dundee 'cpp: Add PixelBuffer<> and VariantPixelBuffer' (exclude comment)
  # PR 1136 melissalinkert 'Add initial support for reading BinaryOnly OME-TIFF datasets (rebased onto develop)' (label: exclude)
  # PR 978 berl 'Add writing of .v3draw format for easy loading with Vaa3D.' (user: berl)
  # PR 1054 qidane 'Additional annotation points throughout the model' (exclude comment)
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files' (label: exclude)
  # PR 1161 sommerc 'Initial CellH5 Reader class' (user: sommerc)
Updating 63fc1e0..3b856bc
Merged PRs (fast-forward):
  # PR 1191 melissalinkert 'FakeReader improvements, part 1'
  # PR 1205 melissalinkert 'TIFF: correctly account for ```fakeBigTiff``` when reading IFD entries'
  # PR 1209 melissalinkert 'ND2: fix tile reading when the X coordinate is > 0'
  # PR 1212 melissalinkert 'Fix Z and T size calculation for InCell 6000 data'
  # PR 1211 joshmoore 'Close IFormatReader copy if not to be used (rebased onto develop)'
  # PR 1208 rleigh-dundee 'docs: Merge xsd-fu prerequisites into build instructions (develop)'
  # PR 1199 melissalinkert 'Nikon .nd2 fixes, part 3 (rebased onto develop)'
  # PR 1193 melissalinkert 'Leica LIF: do not set Channel.Color for RGB images'
  # PR 1192 melissalinkert 'DICOM: fix units for physical sizes'
  # PR 1195 melissalinkert 'OME-TIFF: close helper readers when working with single-plane files (rebased onto develop)'
  # PR 1178 melissalinkert 'Nikon .nd2 fixes, part 2 (rebased onto develop)'
  # PR 1164 melissalinkert 'Add modulo support for LI-FLIM data'
  # PR 1187 melissalinkert 'ScanR: fix exposure time units'
  # PR 1194 melissalinkert 'CZI: prevent NumberFormatExceptions on missing/invalid position values (rebased onto develop)'

Merged PRs:
  # PR 983 melissalinkert 'Woolz: make sure the service is initialized when calling openBytes (rebased onto develop)'
  # PR 1154 melissalinkert 'Leica: prevent exception when linking EmissionFilter'
  # PR 1200 melissalinkert 'Fix off-by-one in LZW decoding'
  # PR 1210 melissalinkert 'Zeiss LSM: fix offset calculationg for > 4GB files with SizeT > 1'
Repository: ome/scripts
Updating 9f8a7a0..9771f00
Merged PRs (fast-forward):
  # PR 88 mtbc 'Image from roi (rebased from dev_5_0)'

Repository: openmicroscopy/ome-documentation
Updating 191511b..ce96fa7
Merged PRs (fast-forward):
  # PR 858 hflynn 'Tidy Upgrade page incl. Paris requests for 5.0.3 (rebased onto develop)'
  # PR 861 hflynn 'Fix Dave Duhlman links in Model docs'
  # PR 857 sbesson 'Document orphaned datasets/plates retrieval via getProjects/getScreens (rebased onto develop)'
  # PR 854 mtbc 'Managed repository template path expansions (rebased from dev_5_0)'
  # PR 856 hflynn 'Removing developer standards page'
  # PR 824 sbesson 'OME DCO'
  # PR 834 aleksandra-tarkowska 'Session engine'
  # PR 849 hflynn 'Reformatting VA docs to make them less scary  (rebased onto develop)'
  # PR 846 hflynn 'Insert OMERO sidebar template after page TOC sidebar (rebased onto develop)'
  # PR 850 hflynn 'Re-working OMERO sysadmin index page (rebased onto develop)'
  # PR 843 aleksandra-tarkowska 'adding HTTP response header'
  # PR 845 manics 'Clarify fastcgi (rebased onto develop)'
  # PR 827 aleksandra-tarkowska 'Nginx doc'

Merged PRs:
  # PR 799 manics 'Linux walkthrough (rebased onto develop)'
  # PR 864 mtbc 'move %time% template expansion term to only user-owned (rebased from dev_5_0)'
  # PR 865 dpwrussell 'Added documentation for Active Directory LDAP'
  # PR 867 sbesson 'Revert "OME DCO"'
Generated by OMERO-5.1-merge-push#333 (http://ci.openmicroscopy.org/job/OMERO-5.1-merge-push/333/)