merge dev_5_0 -Dorg -Ssuccess-only: PR 1281 (Update release notes for 5.0.4)
merge dev_5_0 -Dorg -Ssuccess-only: PR 1291 (ND2: prevent NumberFormatExceptions when parsing text data)
merge dev_5_0 -Dorg -Ssuccess-only

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'

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