merge develop -D org: PR 771 (Adding pyramid generation data duplication warning to in-place import (rebased onto develop))
merge develop -D org

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 743 sbesson 'Propose redesign of OMERO and Bio-Formats 5.0 CI jobs' (exclude comment)
Updating 4a0f585..921cdd8
Merged PRs (fast-forward):
  # PR 760 rleigh-dundee 'Make Ice 3.4 the minimum supported version'
  # PR 768 hflynn 'Rephrasing CONTRIBUTING re: branch for PRs (rebased onto develop)'
  # PR 769 hflynn 'Making API doc links point at release version (rebased onto develop)'

Merged PRs:
  # PR 771 hflynn 'Adding pyramid generation data duplication warning to in-place import (rebased onto develop)'

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