If a hql query retrieves non string data put a placeholder in
Merge pull request #2181 from bpindelski/rebased/dev_5_0/11989_omero_bat

Fix PYTHONPATH whitespace issue on Windows (see #11989). (rebased onto dev_5_0)
Add Trusted-Only:true to the Insight manifest.

See http://docs.oracle.com/javase/6/docs/technotes/guides/jweb/mixed_code.html#trusted_only
Don't sign the webstart jars by default.

We're going to be code-signing in a separate process, so this prevents jars being double-signed, once with the self-signed cert and once with a proper one.

The webstart-sign target is still there, so you can use `./build.py webstart-sign release-webstart`.
Use official OMERO.matlab name when loading toolbox with loadOmero()
merge dev_5_0 -D org: PR 2108 (release-src includes bioformats version metadata)
merge dev_5_0 -D org: PR 2158 (assist #11091: refactor server DB queries for hierarchy navigation (rebased))
merge dev_5_0 -D org: PR 2167 (Passes channel configuration to Make_Movie (see #12036))
merge dev_5_0 -D org: PR 2173 (Minor adjustments for imagej-omero)
merge dev_5_0 -D org: PR 2176 (dev_5_0: Update upgrade check handling in OMERO.web)
merge dev_5_0 -D org: PR 2183 (Login as cli)
merge dev_5_0 -D org: PR 2185 (Mip 5150 (rebased onto dev_5_0))
merge dev_5_0 -D org: PR 2187 (Server restart)
merge dev_5_0 -D org: PR 2190 (HQL binary data)
merge dev_5_0 -D org: PR 2193 (More webstart code-signing changes)
merge dev_5_0 -D org: PR 2196 (Use official OMERO.matlab name when loading toolbox with loadOmero())
merge dev_5_0 -D org

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2184 joshmoore 'CLI bug fixes' (status: failure)
  # PR 2180 mtbc 'fix #12011: move/delete datasets that share images' (exclude comment)
  # PR 2168 snoopycrimecop 'Update dev_5_0 submodules' (status: )
Already up-to-date.

Merged PRs:
  # PR 2108 rleigh-dundee 'release-src includes bioformats version metadata'
  # PR 2158 mtbc 'assist #11091: refactor server DB queries for hierarchy navigation (rebased)'
  # PR 2167 cneves 'Passes channel configuration to Make_Movie (see #12036)'
  # PR 2173 joshmoore 'Minor adjustments for imagej-omero'
  # PR 2176 chris-allan 'dev_5_0: Update upgrade check handling in OMERO.web'
  # PR 2183 joshmoore 'Login as cli'
  # PR 2185 will-moore 'Mip 5150 (rebased onto dev_5_0)'
  # PR 2187 joshmoore 'Server restart'
  # PR 2190 manics 'HQL binary data'
  # PR 2193 manics 'More webstart code-signing changes'
  # PR 2196 sbesson 'Use official OMERO.matlab name when loading toolbox with loadOmero()'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 979 melissalinkert 'SVS import and TIFF export fixes' (status: failure)
  # PR 951 ctrueden 'Fix up Bio-Formats POMs' (status: )
Updating 85f8d80..6c78e1f
Merged PRs (fast-forward):
  # PR 968 melissalinkert 'Cellomics: a few fixes for single-file datasets (rebased onto dev_5_0)'
  # PR 957 melissalinkert 'Correctly set Modulo annotations for multi-Image datasets (rebased onto dev_5_0)'
  # PR 958 melissalinkert 'Flex: be more permissive in parsing IFDs and XML (rebased onto dev_5_0)'
  # PR 976 hflynn 'Fix links to Zeiss image browser software'
  # PR 941 melissalinkert 'Fix the download URL for stable release jars'
  # PR 969 melissalinkert 'Woolz: make sure the service is initialized when calling openBytes'

Merged PRs:
  # PR 915 imunro 'Fix for single channel  meas_mode 13 data.'
  # PR 946 melissalinkert 'Read internal pyramids from CellSens .vsi data'
  # PR 952 melissalinkert 'Memoization fixes'
  # PR 960 melissalinkert 'Cache OME-XML between ImagePluses (rebased onto dev_5_0)'
  # PR 972 melissalinkert 'CZI: restrict dimension adjustment'
  # PR 984 melissalinkert 'Enable SDT plane preloading by default'

Repository: ome/scripts
Updating c0916f6..d9b2af5
Merged PRs (fast-forward):
  # PR 68 will-moore 'Kymograph_Analysis creates single csv. See #11909 (rebased onto dev_5_0)'

Merged PRs:
  # PR 70 cneves 'Allow passing extra channel rendering options to Make_Movie script'
  # PR 71 will-moore 'Kymograph analysis march 12th (rebased onto dev_5_0)'

Repository: openmicroscopy/ome-documentation
Updating 85c8eab..27e5deb
Merged PRs (fast-forward):
  # PR 698 joshmoore 'Fix Windows paths error found by Javier Colmeiro'
  # PR 696 hflynn 'Removing contributing & formats docs from dev_5_0'

Merged PRs:
  # PR 702 bpindelski 'Remove paragraph about whitespace and Ice. (rebased onto dev_5_0)'
Conflicting PRs (not included):
  # PR 703 hflynn 'Updates to sysadmin installation docs'

Generated by OMERO-5.0-merge-daily#611 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-daily/611/)