merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 19 (Split view merged 10109 (develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: ome/scripts
Already up-to-date.
Merged PRs:
  # PR 19 will-moore 'Split view merged 10109 (develop)'

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