merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 746 hflynn 'Use ant to build sphinx docs (rebased onto dev_5_0)' (status: failure)
Already up-to-date.

Generated by OMERO-5.0-merge-daily#635 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-daily/635/)