merge develop -D org

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 776 sbesson 'Remove all references to CI jobs in the official documentation' (label: exclude)
  # PR 743 sbesson 'Propose redesign of OMERO and Bio-Formats 5.0 CI jobs' (exclude comment)
Updating 309d0cf..b156b28
Merged PRs (fast-forward):
  # PR 772 rleigh-dundee 'make: Convert variables to ant properties'

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