Fix tile counts when invalid resolutions are skipped
Adding symbol for inch
Merge pull request #1379 from melissalinkert/new-units

New units
Merge pull request #1389 from qidane/new-units

Adding symbol for inch
fixes JUnit4TestAdapterCache not found when running tests with ant 1.9
Merge pull request #1388 from rleigh-dundee/cpp-testcond

C++: Update NDEBUG usage in death tests
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 1381 (Parse physical pixel sizes from CellSens .vsi datasets)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 1382 (Leica LIF: fix support for new files with 0 padding)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 1384 (OME-TIFF: return blank planes if the corresponding file does not exist)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 1385 (C++: Add TIFF reader)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 1386 (Zeiss CZI: fix dimension calculations when expected planes are missing)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 1387 (Fix testng JAR for Bio-Formats tools components)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 1390 (Fix for unit tests run with ant 1.9)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1366 ctrueden 'Miscellaneous cleanup' (label: exclude)
  # PR 1365 ctrueden 'PrairieView 5.2 fixes and improvements' (label: exclude)
  # PR 1309 melissalinkert 'Allow tile-based access of large JPEG-2000 images' (exclude comment)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 858 melissalinkert 'Initial support for Veeco AFM data' (label: exclude)
  # PR 1383 LeeKamentsky 'Fix im3 metadata' (user: LeeKamentsky)
  # PR 1177 rleigh-dundee 'specification: Add metadata for HDF5 embedding' (exclude comment)
  # PR 1362 melissalinkert 'Make FormatReader's RandomAccessInputStream transient' (label: breaking)
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files' (label: exclude)
  # PR 1161 sommerc 'Initial CellH5 Reader class' (user: sommerc)
Updating ec58965..6a29d89
Previously merged:
  # PR 1388 rleigh-dundee 'C++: Update NDEBUG usage in death tests'

Merged PRs:
  # PR 1381 melissalinkert 'Parse physical pixel sizes from CellSens .vsi datasets'
  # PR 1382 melissalinkert 'Leica LIF: fix support for new files with 0 padding'
  # PR 1384 melissalinkert 'OME-TIFF: return blank planes if the corresponding file does not exist'
  # PR 1385 rleigh-dundee 'C++: Add TIFF reader'
  # PR 1386 melissalinkert 'Zeiss CZI: fix dimension calculations when expected planes are missing'
  # PR 1387 sbesson 'Fix testng JAR for Bio-Formats tools components'
  # PR 1390 simleo 'Fix for unit tests run with ant 1.9'

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