merge dev_5_0 -D org: PR 1018 (Flex: fix support for new file naming scheme)
merge dev_5_0 -D org: PR 1061 (Fix 5D Imspector support)
merge dev_5_0 -D org

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1067 imunro 'Allow for a >1 count increment in B&H .sdt Files.' (status: error)
Updating 91fff0a..001c8a5
Merged PRs (fast-forward):
  # PR 1072 hflynn 'Adding CONTRIBUTING file to BF repo'
  # PR 1074 rleigh-dundee 'docs: Delegate all sphinx Makefile targets to ant'
  # PR 1071 hflynn 'Remove dead bitmap link'
  # PR 1069 rleigh-dundee 'Use ant to build sphinx docs (rebased)'
  # PR 1066 melissalinkert 'Fix file handle/line ending issues so that tests pass on Windows (rebased onto dev_5_0)'
  # PR 1064 melissalinkert 'SVS: store the PhysicalSizeX and PhysicalSizeY attributes (rebased onto dev_5_0)'
  # PR 1062 melissalinkert 'DICOM: expand sequence reading to include known sequences'

Merged PRs:
  # PR 1018 melissalinkert 'Flex: fix support for new file naming scheme'
  # PR 1061 melissalinkert 'Fix 5D Imspector support'

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