rebased OmeroPy/src/path.py onto upstream version 5.2
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 2792 (fix #11096: ensure that new %time% directory is unique (rebased from dev_5_0))
merge develop -D org: PR 2795 (Use mklink under Windows (rebased onto develop))
merge develop -D org: PR 2797 (OmeroCpp: switch build system from SCons to CMake)
merge develop -D org: PR 2799 (Auto close (rebased onto develop))
merge develop -D org: PR 2805 (`fs rename` command for modifying template values (rebased onto develop))
merge develop -D org: PR 2809 (Update develop submodules)
merge develop -D org: PR 2810 (Pytest markers registration (rebased onto develop))
merge develop -D org: PR 2812 (Overhaul of Insight's Search, Part 2 (rebased onto develop))
merge develop -D org: PR 2813 (Sphinx api improvements (rebased onto develop))
merge develop -D org: PR 2821 (12252 script limit (rebased onto develop))
merge develop -D org: PR 2824 (Use "pid" instead of "state" for checking service. (rebased onto develop))
merge develop -D org: PR 2830 (Show error message if group permission downgrade fails (rebased onto develop))
merge develop -D org: PR 2831 (OmeroCpp: Add portability fixes for gtest)
merge develop -D org: PR 2835 (Update OmeroPy/src/path.py)
merge develop -D org

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2803 joshmoore 'Add `upload_rm` file transfer option (rebased onto develop)' (status: error)
  # PR 2403 aleksandra-tarkowska 'Send email' (label: breaking)
  # PR 2585 aleksandra-tarkowska 'making time_zone and first_day_of_week configurable' (exclude comment)
  # PR 2363 dominikl 'Java Gateway API' (label: exclude breaking)
  # PR 2811 bpindelski 'Allow foregrounding of the server process (see #12281). (rebased onto develop)' (status: )
  # PR 2182 joshmoore 'Read only flag' (label: exclude)
  # PR 2412 qidane 'Extra annotations' (exclude comment)
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 2792 mtbc 'fix #11096: ensure that new %time% directory is unique (rebased from dev_5_0)'
  # PR 2795 joshmoore 'Use mklink under Windows (rebased onto develop)'
  # PR 2797 rleigh-dundee 'OmeroCpp: switch build system from SCons to CMake'
  # PR 2799 joshmoore 'Auto close (rebased onto develop)'
  # PR 2805 joshmoore '`fs rename` command for modifying template values (rebased onto develop)'
  # PR 2809 snoopycrimecop 'Update develop submodules'
  # PR 2810 sbesson 'Pytest markers registration (rebased onto develop)'
  # PR 2812 dominikl 'Overhaul of Insight's Search, Part 2 (rebased onto develop)'
  # PR 2813 sbesson 'Sphinx api improvements (rebased onto develop)'
  # PR 2821 joshmoore '12252 script limit (rebased onto develop)'
  # PR 2824 bpindelski 'Use "pid" instead of "state" for checking service. (rebased onto develop)'
  # PR 2830 dominikl 'Show error message if group permission downgrade fails (rebased onto develop)'
  # PR 2831 rleigh-dundee 'OmeroCpp: Add portability fixes for gtest'
  # PR 2835 simleo 'Update OmeroPy/src/path.py'
Conflicting PRs (not included):
  # PR 2832 sbesson 'Add travis_retry to sudo apt-get install and pip install in .travis.yml (rebased onto develop)'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # 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 858 melissalinkert 'Initial support for Veeco AFM data' (label: exclude)
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
  # PR 1141 LeeKamentsky 'Reader for Amaris FlowSight .cif format' (label: exclude)
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files' (label: exclude)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 978 berl 'Add writing of .v3draw format for easy loading with Vaa3D.' (user: berl)
  # PR 1225 sbesson 'Fix bfGetReader for empty input (rebased onto develop)' (status: error)
  # PR 1054 qidane 'Additional annotation points throughout the model' (exclude comment)
  # PR 1161 sommerc 'Initial CellH5 Reader class' (user: sommerc)
  # PR 1177 rleigh-dundee 'specification: Add metadata for HDF5 embedding' (exclude comment)
Already up-to-date.

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 1210 melissalinkert 'Zeiss LSM: fix offset calculationg for > 4GB files with SizeT > 1'
  # PR 1220 emilroz 'Czi expand metadata to all the channels (rebased onto develop)'

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

Merged PRs:
  # PR 90 bpindelski 'Avoid division by 0 in Plot Profile. (rebased onto develop)'

Repository: openmicroscopy/ome-documentation
Updating 474b070..48714df
Merged PRs (fast-forward):
  # PR 891 sbesson 'Add travis_retry to sudo apt-get install commands in .travis.yml (rebased onto develop)'
  # PR 888 sbesson 'Expand setup.py test/py.test options description (rebased onto develop)'
  # PR 889 rleigh-dundee 'Update recommended PostgreSQL version to 9.2 for float bug fix'
  # PR 886 ximenesuk 'DropBox note (rebased onto develop)'
  # PR 890 joshmoore 'New search docs (rebased onto develop)'

Merged PRs:
  # PR 879 dpwrussell 'Added warning about web plugins to upgrade docs'
  # PR 883 bpindelski 'Document client requirements for in-place import on Windows. (rebased onto develop)'
  # PR 887 sbesson '5.0.3: CLI documentation (rebased onto develop)'

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