merge develop --exclude conflict needs-fixes broken

Repository: openmicroscopy/ome-documentation
Updating 2e32665..bc8e28f

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