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 999 (Fix for single channel  meas_mode 13 data (rebased onto develop))
merge develop -D org: PR 1014 (Add initial structure for decompressing JPEG XR images (assist #8493).)
merge develop -D org: PR 1028 (Large fileset performance improvements (rebased onto develop))
merge develop -D org: PR 1029 (TIFF: adjust optimal tile height if tiles have height of 1 (rebased onto develop))
merge develop -D org: PR 1030 (CZI: restrict dimension adjustment (rebased onto develop))
merge develop -D org: PR 1031 (Volocity: parse timestamps from .atsf files (rebased onto develop))
merge develop -D org: PR 1035 (C++: Compatibility workrounds for Boost.Filesystem 1.46 and earlier)
merge develop -D org

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 1002 qidane 'Adding a Map type and MapAnnotation' (label: breaking)
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
  # PR 978 berl 'Add writing of .v3draw format for easy loading with Vaa3D.' (user: berl)
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI' (label: exclude)
Updating 60ca551..dc857b1
Merged PRs (fast-forward):
  # PR 1032 melissalinkert 'Update version history for 5.0.1 (rebased onto develop)'
  # PR 1006 melissalinkert 'Read internal pyramids from CellSens .vsi data (rebased onto develop)'
  # PR 1008 melissalinkert 'Enable SDT plane preloading by default (rebased onto develop)'
  # PR 1007 melissalinkert 'SVS import and TIFF export fixes (rebased onto develop)'
  # PR 1005 melissalinkert 'ND2: always set the field index to 2 (rebased onto develop)'
  # PR 1004 bpindelski 'Update docs regarding BF and Eclipse (see #12127). (rebased onto develop)'
  # PR 991 melissalinkert 'Only add a MetadataOnly element if no TiffData elements are present'
  # PR 990 melissalinkert 'Memoization fixes (rebased onto develop)'

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 999 melissalinkert 'Fix for single channel  meas_mode 13 data (rebased onto develop)'
  # PR 1014 bpindelski 'Add initial structure for decompressing JPEG XR images (assist #8493).'
  # PR 1028 melissalinkert 'Large fileset performance improvements (rebased onto develop)'
  # PR 1029 melissalinkert 'TIFF: adjust optimal tile height if tiles have height of 1 (rebased onto develop)'
  # PR 1030 melissalinkert 'CZI: restrict dimension adjustment (rebased onto develop)'
  # PR 1031 melissalinkert 'Volocity: parse timestamps from .atsf files (rebased onto develop)'
  # PR 1035 rleigh-dundee 'C++: Compatibility workrounds for Boost.Filesystem 1.46 and earlier'

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