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

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 990 kennethgillen 'for users who have compiled isapi_wsgi on x64' (user: kennethgillen)
Already up-to-date.

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