Fix indentation
Add short comment describing the special case of the root folder
Merge pull request #1286 from melissalinkert/rebased/develop/concurrent-hash-map

Fix declaration of ConcurrentHashMap instance (rebased onto develop)
merge develop -Dorg -Ssuccess-only: PR 1154 (Leica: prevent exception when linking EmissionFilter)
merge develop -Dorg -Ssuccess-only: PR 1252 (Add Example code or writing Plate data to ome-tiff.)
merge develop -Dorg -Ssuccess-only: PR 1279 (travis: Build with Oracle JDK 8)
merge develop -Dorg -Ssuccess-only: PR 1285 (Fix Memoizer.getMemoFile(id) when directory is the root path)
merge develop -Dorg -Ssuccess-only

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1141 LeeKamentsky 'Reader for Amaris FlowSight .cif format' (label: exclude)
  # PR 1265 qidane 'New units' (label: exclude breaking)
  # PR 1161 sommerc 'Initial CellH5 Reader class' (user: sommerc)
  # PR 858 melissalinkert 'Initial support for Veeco AFM data' (label: exclude)
  # 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 1268 carandraug 'multiple netpbm fixes' (user: carandraug)
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files' (label: exclude)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 1249 PremyslFiala 'ND2 - Bug fixes' (user: PremyslFiala)
  # PR 1054 qidane 'Additional annotation points throughout the model' (exclude comment)
Updating 8cbf2c3..9d2af4a
Previously merged:
  # PR 1286 melissalinkert 'Fix declaration of ConcurrentHashMap instance (rebased onto develop)'

Merged PRs:
  # PR 1154 melissalinkert 'Leica: prevent exception when linking EmissionFilter'
  # PR 1252 imunro 'Add Example code or writing Plate data to ome-tiff.'
  # PR 1279 rleigh-dundee 'travis: Build with Oracle JDK 8'
  # PR 1285 sbesson 'Fix Memoizer.getMemoFile(id) when directory is the root path'

Generated by OME-5.1-merge-push#413 (http://ci.openmicroscopy.org/job/OME-5.1-merge-push/413/)
Update auto-generated documentation

Repository: snoopycrimecop/bioformats

Generated by BIOFORMATS-5.1-merge-docs-autogen#20 (http://ci.openmicroscopy.org/job/BIOFORMATS-5.1-merge-docs-autogen/20/)