Merge remote-tracking branch 'origin/develop' into required-directory-test
Zip: make sure that the file mapping is correct during openBytes

This prevents openBytes from failing if close() was called on a
different ZipReader initialized with the same file.
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 1296 (Add test for getRequiredDirectories)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1362 melissalinkert 'Make FormatReader's RandomAccessInputStream transient' (label: breaking)
  # PR 858 melissalinkert 'Initial support for Veeco AFM data' (label: exclude)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 1161 sommerc 'Initial CellH5 Reader class' (user: sommerc)
  # PR 1363 rleigh-dundee 'C++: Add TIFF strip/tile write support' (status: failure)
  # PR 1249 PremyslFiala 'ND2 - Bug fixes' (user: PremyslFiala)
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
  # PR 1177 rleigh-dundee 'specification: Add metadata for HDF5 embedding' (exclude comment)
  # PR 1265 qidane 'New units' (label: breaking)
  # PR 1309 melissalinkert 'Allow tile-based access of large JPEG-2000 images' (exclude comment)
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 1296 melissalinkert 'Add test for getRequiredDirectories'

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