Support show=image-1|image-2
New OmeroWeb/test for show=project-1|project-2
Fix flake8 errors
Fix flake8 errors
merge dev_5_0 -Dorg -Ssuccess-only: PR 2931 (Update dev_5_0 submodules)
merge dev_5_0 -Dorg -Ssuccess-only: PR 2940 (Java8 (rebased onto dev_5_0))
merge dev_5_0 -Dorg -Ssuccess-only: PR 2971 (Bugfixes for 5 0 4 (rebased onto dev_5_0))
merge dev_5_0 -Dorg -Ssuccess-only: PR 2973 (show multiple objects (rebased onto dev_5_0))
merge dev_5_0 -Dorg -Ssuccess-only: PR 2976 (Jdk1.8 nobootclass dev 5 0)
merge dev_5_0 -Dorg -Ssuccess-only

Repository: openmicroscopy/openmicroscopy
Already up-to-date.

Merged PRs:
  # PR 2931 snoopycrimecop 'Update dev_5_0 submodules'
  # PR 2940 jburel 'Java8 (rebased onto dev_5_0)'
  # PR 2971 will-moore 'Bugfixes for 5 0 4 (rebased onto dev_5_0)'
  # PR 2973 will-moore 'show multiple objects (rebased onto dev_5_0)'
  # PR 2976 jburel 'Jdk1.8 nobootclass dev 5 0'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1282 melissalinkert 'Update version numbers to 5.0.4' (label: exclude)
Updating 608008b..5782d8c
Previously merged:
  # PR 1287 sbesson 'Add reader for PicoQuant .bin files. (rebased onto dev_5_0)'
  # PR 1289 melissalinkert 'Volocity: flag most files as being pixels files (rebased onto dev_5_0)'
  # PR 1288 melissalinkert 'Analyze: set littleEndian flag correctly (rebased onto dev_5_0)'

Merged PRs:
  # PR 1281 melissalinkert 'Update release notes for 5.0.4'
  # PR 1291 melissalinkert 'ND2: prevent NumberFormatExceptions when parsing text data'

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

Repository: openmicroscopy/ome-documentation
Updating 7e549b4..d83e83c
Previously merged:
  # PR 951 mtbc 'improve and update server configuration documentation (rebased from develop)'

Merged PRs:
  # PR 956 rleigh-dundee 'Installation: Specify what to do for N/A in package lists (dev_5_0)'

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