merge develop -D none -I breaking -E exclude

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 744 rleigh-dundee 'Use ant to build sphinx docs' (user: rleigh-dundee)
  # 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-breaking-push#31 (http://ci.openmicroscopy.org/job/OMERO-5.1-breaking-push/31/)