merge dev_5_0 -D org: PR 1018 (Flex: fix support for new file naming scheme)
merge dev_5_0 -D org: PR 1078 (Lots of Zeiss CZI fixes)
merge dev_5_0 -D org: PR 1080 (Exclude log4j and packages from target-test-runner)
merge dev_5_0 -D org: PR 1081 (Disable file grouping in ImageJ remote import plugin)
merge dev_5_0 -D org: PR 1084 (make: Convert variables to ant properties)
merge dev_5_0 -D org: PR 1085 (Fix single plane ND2 line scan)
merge dev_5_0 -D org: PR 1086 (QuickTime: fix header/footer parsing bug)
merge dev_5_0 -D org

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1087 melissalinkert 'Metamorph .nd performance improvements' (status: error)
Updating c799e87..174bbd5
Merged PRs (fast-forward):
  # PR 1077 melissalinkert 'CellSens: fix off-by-ones in subresolution tile calculations'
  # PR 1079 melissalinkert 'Gatan metadata fixes'
  # PR 1061 melissalinkert 'Fix 5D Imspector support'
  # PR 1067 imunro 'Allow for a >1 count increment in B&H .sdt Files.'
  # 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'

Merged PRs:
  # PR 1018 melissalinkert 'Flex: fix support for new file naming scheme'
  # PR 1078 melissalinkert 'Lots of Zeiss CZI fixes'
  # PR 1080 melissalinkert 'Exclude log4j and packages from target-test-runner'
  # PR 1081 melissalinkert 'Disable file grouping in ImageJ remote import plugin'
  # PR 1084 rleigh-dundee 'make: Convert variables to ant properties'
  # PR 1085 melissalinkert 'Fix single plane ND2 line scan'
  # PR 1086 melissalinkert 'QuickTime: fix header/footer parsing bug'

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