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)
Already up-to-date.

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