merge develop --exclude conflict needs-fixes broken

Repository: ome/scripts
Updating 457e85a..272c83a

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