merge develop --exclude conflict needs-fixes broken

Repository: openmicroscopy/ome-documentation
Updating 2e32665..66b4162

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