Merge pull request #1291 from melissalinkert/ticket-12536

ND2: prevent NumberFormatExceptions when parsing text data
merge dev_5_0 -Dorg -Ssuccess-only: PR 1281 (Update release notes for 5.0.4)
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 5782d8c..077b4bf
Previously merged:
  # PR 1291 melissalinkert 'ND2: prevent NumberFormatExceptions when parsing text data'

Merged PRs:
  # PR 1281 melissalinkert 'Update release notes for 5.0.4'

Generated by OME-5.0-merge-push#202 (http://ci.openmicroscopy.org/job/OME-5.0-merge-push/202/)
Update auto-generated documentation

Repository: snoopycrimecop/bioformats

Generated by BIOFORMATS-5.0-merge-docs-autogen#39 (http://ci.openmicroscopy.org/job/BIOFORMATS-5.0-merge-docs-autogen/39/)