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 1097 (CellSens: fix off-by-ones in subresolution tile calculations (rebased onto develop))
merge develop -D org: PR 1106 (Imaris HDF: make sure that all resolutions have the same ZCT sizes (rebased onto develop))
merge develop -D org: PR 1110 (BF docs: Jenkins cleanup (rebased onto develop))
merge develop -D org: PR 1123 (Add a reader that accepts a file containing a file pattern)
merge develop -D org: PR 1135 (Update native-lib-loader to 2.0.1 release (rebased onto develop))
merge develop -D org: PR 1137 (Update version history for 5.0.2 (rebased onto develop))
merge develop -D org

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1136 melissalinkert 'Add initial support for reading BinaryOnly OME-TIFF datasets (rebased onto develop)' (label: exclude)
  # 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 1141 LeeKamentsky 'Reader for Amaris FlowSight .cif format' (user: LeeKamentsky)
  # PR 1116 rleigh-dundee 'cpp: Add TIFF support (1)' (label: exclude)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 1108 melissalinkert 'MRC: fix handling of mode 16 data (rebased onto develop)' (status: error)
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
Updating 2dae257..ae7edeb
Merged PRs (fast-forward):
  # PR 1103 melissalinkert 'Flex: fix support for new file naming scheme (rebased onto develop)'
  # PR 1092 sbesson 'Allow for a >1 count increment in B&H .sdt Files. (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 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 1097 melissalinkert 'CellSens: fix off-by-ones in subresolution tile calculations (rebased onto develop)'
  # PR 1106 melissalinkert 'Imaris HDF: make sure that all resolutions have the same ZCT sizes (rebased onto develop)'
  # PR 1110 sbesson 'BF docs: Jenkins cleanup (rebased onto develop)'
  # PR 1123 melissalinkert 'Add a reader that accepts a file containing a file pattern'
  # PR 1135 joshmoore 'Update native-lib-loader to 2.0.1 release (rebased onto develop)'
  # PR 1137 melissalinkert 'Update version history for 5.0.2 (rebased onto develop)'
Conflicting PRs (not included):
  # PR 1138 melissalinkert 'Lots of Zeiss CZI fixes (rebased onto develop)'

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