merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 221 (Fixing ticket 10174 (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/ome-documentation
Updating dd7e4e5..91a86a6
Merged PRs:
  # PR 221 hflynn 'Fixing ticket 10174 (rebased onto develop)'

Generated by OMERO-merge-develop#125 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-develop/125/)