merge develop -Dnone -Ibreaking -Eexclude -Sno-error

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 1012 sbesson 'Add documentation for new OME-help-release job' (user: sbesson)
  # PR 1009 manics 'Update Linux walkthrough to 5.0.5 (rebased onto develop)' (user: manics)
  # PR 990 kennethgillen 'for users who have compiled isapi_wsgi on x64' (user: kennethgillen)
Updating 99514d2..47e3bec
Previously merged:
  # PR 1011 sbesson 'Redirect Python API documentation to new Sphinx-generated pages'
  # PR 1010 hflynn 'Minor tidying of contributing docs'
  # PR 1008 hflynn 'Adding link to secvuln on sysadmin security page (rebased onto develop)'

Generated by OME-5.1-breaking-push#122 (http://ci.openmicroscopy.org/job/OME-5.1-breaking-push/122/)