Fix #11989: set PYTHONPATH once on Windows.
Ressurect setpythonpath.bat.
Merge pull request #2151 from snoopycrimecop/merge/develop/submodules

Update develop submodules
Set default socket timeout correctly (Fixes #12097)

Python socket timeouts are specified in seconds as floating point.  This
commit sets the default timeout to a more reasonable 3 seconds, allows
the specification of a floating point timeout value, removes the
assumption that the timeout is specified in milliseconds and documents
all of the aforementioned.
Support for configuring the upgrade check URL (See #12097)

This commit adds configurability to the upgrade check URL via the
OMERO.web configuration mechanism.  Upgrade checks in OMERO.web can now
be disabled by running:

    bin/omero config set omero.web.upgrades_url ''
merge develop -D org: PR 1960 (Remove cut link 11882)
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 2160 (Warning dialog before deletion of linked images)
merge develop -D org: PR 2161 (Minify viewer media)
merge develop -D org: PR 2162 (Bugfix: Image import: File naming settings were ignored)
merge develop -D org: PR 2165 (Inplace file path)
merge develop -D org: PR 2174 (Fix PYTHONPATH whitespace issue on Windows (see #11989).)
merge develop -D org: PR 2177 (develop: Update upgrade check handling in OMERO.web)
merge develop -D org

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2171 dominikl 'Added ROI filtering option' (status: failure)
  # PR 2163 qidane 'New wavelength changes' (exclude comment)
  # PR 2036 joshmoore 'DSL Map Type' (exclude comment)
  # PR 2128 jburel 'Open with develop' (label: exclude)
  # PR 1385 manics 'Update the OMERO VirtualBox image' (exclude comment)
Already up-to-date.

Merged PRs:
  # PR 1960 will-moore 'Remove cut link 11882'
  # PR 2127 dpwrussell 'Working view to email announcements to selected users, groups, email addresses and/or all users'
  # PR 2160 dominikl 'Warning dialog before deletion of linked images'
  # PR 2161 aleksandra-tarkowska 'Minify viewer media'
  # PR 2162 dominikl 'Bugfix: Image import: File naming settings were ignored'
  # PR 2165 dominikl 'Inplace file path'
  # PR 2174 bpindelski 'Fix PYTHONPATH whitespace issue on Windows (see #11989).'
  # PR 2177 chris-allan 'develop: Update upgrade check handling in OMERO.web'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 978 berl 'Add writing of .v3draw format for easy loading with Vaa3D.' (user: berl)
  # PR 881 qidane 'New wavelength' (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)
Already up-to-date.

Merged PRs:
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files'
  # PR 858 melissalinkert 'Initial support for Veeco AFM data'
  # PR 859 melissalinkert 'Assorted metadata/tile parsing fixes'
  # PR 970 rleigh-dundee 'C++: Add FormatReader implementation'
  # PR 973 rleigh-dundee 'C++: Fixes for the OME-XML model and metadata store interfaces'
  # PR 975 rleigh-dundee 'cpp: cmake: Don't enable -pedantic if it breaks long long use'

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

Repository: openmicroscopy/ome-documentation
Updating 8435d81..81befaf
Merged PRs (fast-forward):
  # PR 699 sbesson 'Contributing: CI restructuring'
  # PR 700 joshmoore 'Fix Windows paths error found by Javier Colmeiro (rebased onto develop)'

Merged PRs:
  # PR 626 pwalczysko 'Add new Squash tutorial and screenshots'

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