merge dev_5_0 -Dorg -Ssuccess-only: PR 2935 (Fixing typo Kenny spotted (rebased onto dev_5_0))
merge dev_5_0 -Dorg -Ssuccess-only

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2931 snoopycrimecop 'Update dev_5_0 submodules' (status: failure)
Already up-to-date.

Merged PRs:
  # PR 2935 hflynn 'Fixing typo Kenny spotted (rebased onto dev_5_0)'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1271 sbesson 'Use new latest/bio-formats5.0 redirects' (status: error)
Updating 5f987c0..fe874c2
Previously merged:
  # PR 1259 bpindelski 'Fix wrong number of channels for images in fake SPW (fix #12501) (rebased onto dev_5_0)'
  # PR 1256 sbesson 'Fix link to Volocity page'
  # PR 1251 melissalinkert 'Update POM version numbers to 5.0.4-SNAPSHOT'

Merged PRs:
  # PR 1262 rleigh-dundee 'jj2000: Fix compile on Java 8 (dev_5_0)'

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

Repository: openmicroscopy/ome-documentation
Updating c1fef5b..a0fb349
Previously merged:
  # PR 942 hflynn 'Tidying a couple of sysadmin docs issues from my absence (rebased onto dev_5_0)'
  # PR 941 bpindelski 'Remove long subparagraphs. (rebased onto dev_5_0)'
  # PR 926 dpwrussell 'Documentation for network hopping for developer laptops (rebased onto dev_5_0)'
  # PR 928 joshmoore 'Include LDAP OR docs from Jake Carroll'
  # PR 927 sbesson 'Fix memory command on server upgrade page'

Merged PRs:
  # PR 945 sbesson 'Use new latest/product5.0 redirects across the board'

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