Changes to ensure pmtMarker is read correctly whatever the length of string read. (See   trac.openmicroscopy.org.uk/ome/ticket/12035 )
An attempt to add FLIM z-stack support.
Fix reading of 5D Imspector data

This fixes various offset issuse when reading files that have multiple
timepoints, Z sections, and channels.

Fixes #12035.
CellSens: fix off-by-ones in subresolution tile calculations
Gatan DM3: make sure that parsed units match up with physical sizes

Fixes #12154.
Gatan DM3: add bounds checking and allow endian swapping for uint values

Fixes #12182.
merge develop -D org: PR 857 (Initial support for Zeiss .lms files)
merge develop -D org: PR 858 (Initial support for Veeco AFM data)
merge develop -D org: PR 981 (Ignore namespaces when filling in an XMLAnnotation's Value)
merge develop -D org: PR 983 (Woolz: make sure the service is initialized when calling openBytes (rebased onto develop))
merge develop -D org: PR 1028 (Large fileset performance improvements (rebased onto develop))
merge develop -D org: PR 1049 (DICOM: fix file grouping so that path names are normalized (rebased onto develop))
merge develop -D org: PR 1060 (Allow dist-matlab to run on Windows)
merge develop -D org: PR 1070 (DICOM: expand sequence reading to include known sequences (rebased onto develop))
merge develop -D org: PR 1082 (C++: Add support for integers of different endianness)
merge develop -D org: PR 1092 (Allow for a >1 count increment in B&H .sdt Files. (rebased onto develop))
merge develop -D org: PR 1096 (Fix 5D Imspector support (rebased onto develop))
merge develop -D org: PR 1097 (CellSens: fix off-by-ones in subresolution tile calculations (rebased onto develop))
merge develop -D org: PR 1098 (Gatan metadata fixes (rebased onto develop))
merge develop -D org

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 1102 melissalinkert 'Metamorph .nd performance improvements (rebased onto develop)' (status: pending)
  # PR 1101 melissalinkert 'QuickTime: fix header/footer parsing bug (rebased onto develop)' (status: pending)
  # PR 1099 melissalinkert 'Disable file grouping in ImageJ remote import plugin (rebased onto develop)' (status: pending)
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
  # PR 1103 melissalinkert 'Flex: fix support for new file naming scheme (rebased onto develop)' (status: pending)
  # PR 1100 melissalinkert 'Fix single plane ND2 line scan (rebased onto develop)' (status: pending)
  # PR 978 berl 'Add writing of .v3draw format for easy loading with Vaa3D.' (user: berl)
  # PR 1054 qidane 'Additional annotation points throughout the model' (exclude comment)
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI' (label: exclude)
Updating f247b30..d4ec8df
Merged PRs (fast-forward):
  # PR 1083 rleigh-dundee 'make: Convert variables to ant properties'
  # PR 1075 hflynn 'Remove dead bitmap link (rebased onto develop)'
  # PR 1076 hflynn 'Adding CONTRIBUTING file to BF repo (rebased onto develop)'
  # PR 1073 rleigh-dundee 'docs: Delegate all sphinx Makefile targets to ant'

Merged PRs:
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files'
  # PR 858 melissalinkert 'Initial support for Veeco AFM data'
  # PR 981 melissalinkert 'Ignore namespaces when filling in an XMLAnnotation's Value'
  # PR 983 melissalinkert 'Woolz: make sure the service is initialized when calling openBytes (rebased onto develop)'
  # PR 1028 melissalinkert 'Large fileset performance improvements (rebased onto develop)'
  # PR 1049 melissalinkert 'DICOM: fix file grouping so that path names are normalized (rebased onto develop)'
  # PR 1060 melissalinkert 'Allow dist-matlab to run on Windows'
  # PR 1070 melissalinkert 'DICOM: expand sequence reading to include known sequences (rebased onto develop)'
  # PR 1082 rleigh-dundee 'C++: Add support for integers of different endianness'
  # PR 1092 sbesson 'Allow for a >1 count increment in B&H .sdt Files. (rebased onto develop)'
  # PR 1096 melissalinkert 'Fix 5D Imspector support (rebased onto develop)'
  # PR 1097 melissalinkert 'CellSens: fix off-by-ones in subresolution tile calculations (rebased onto develop)'
  # PR 1098 melissalinkert 'Gatan metadata fixes (rebased onto develop)'

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