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

Repository: ome/scripts
Updating 3587c87..f1abf9e
Merged PRs:
  # PR 18 will-moore 'Split view merged 10109'

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