merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 713 (Make sure the reference to the connector is removed (see #10333))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 728 (OMERO.tables ArrayColumns #5632 (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 743 (Download original file fs)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 745 (Pass password using -P when creating new user in OMERO-start-*)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 752 (Integrate cpp fixture changes into develop)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 754 (Unload ofile before linking (Fix #10216))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 756 (FS path changes (post-PR669 discussion))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 758 (unescape UTF-8 literals in Java source code (mostly rebase))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 760 (Web bugs jan22nd)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 762 (Adjust construction of path for raw file store retrieval.)
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 713 jburel 'Make sure the reference to the connector is removed (see #10333)'
  # PR 728 manics 'OMERO.tables ArrayColumns #5632 (rebased onto develop)'
  # PR 743 jburel 'Download original file fs'
  # PR 745 sbesson 'Pass password using -P when creating new user in OMERO-start-*'
  # PR 752 JesseCorrington 'Integrate cpp fixture changes into develop'
  # PR 754 joshmoore 'Unload ofile before linking (Fix #10216)'
  # PR 756 mtbc 'FS path changes (post-PR669 discussion)'
  # PR 758 mtbc 'unescape UTF-8 literals in Java source code (mostly rebase)'
  # PR 760 will-moore 'Web bugs jan22nd'
  # PR 762 mtbc 'Adjust construction of path for raw file store retrieval.'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 342 melissalinkert 'setId performance improvements'
  # PR 351 ctrueden 'Add SPW support to FakeReader'
  # PR 374 melissalinkert 'Add method to retrieve the significant directory count'
  # PR 378 rleigh-dundee 'Sprint5 bug fixes (develop)'
  # PR 380 ximenesuk 'Removing ndpi from readers list for fs demo'

Repository: ome/scripts
Already up-to-date.

Repository: openmicroscopy/ome-documentation
Already up-to-date.

Generated by SCC-merge#157 (http://hudson.openmicroscopy.org.uk/job/SCC-merge/157/)