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 be161c6..84d1033
Merged PRs (fast-forward):
  # PR 776 sbesson 'Remove all references to CI jobs in the official documentation'
  # PR 772 rleigh-dundee 'make: Convert variables to ant properties'
  # PR 771 hflynn 'Adding pyramid generation data duplication warning to in-place import (rebased onto develop)'
  # 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)'
  # PR 766 rleigh-dundee 'ant: Default all properties and handle empty vars in conf.py'
  # PR 758 hflynn 'Adding API doc links to OMERO docs front page (rebased onto develop)'
  # PR 759 hflynn 'ticket 10030 fix - contributing file for docs repo (rebased onto develop)'
  # PR 761 rleigh-dundee 'Delegate all Makefile targets to ant'

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