merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 693 (Fs import notifications)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 722 (Fix DropBox on Linux (Fix #9156) (rebased onto develop))
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 732 (Handle the case of unloaded original file (see #10347) (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 738 (Matlab toolbox cleanup (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 747 (Close resource leak in temporary file manager.)
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 755 (Fix directory test when cleaning existing Homebrew taps (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 693 ximenesuk 'Fs import notifications'
  # PR 722 joshmoore 'Fix DropBox on Linux (Fix #9156) (rebased onto develop)'
  # PR 728 manics 'OMERO.tables ArrayColumns #5632 (rebased onto develop)'
  # PR 732 jburel 'Handle the case of unloaded original file (see #10347) (rebased onto develop)'
  # PR 738 sbesson 'Matlab toolbox cleanup (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 747 mtbc 'Close resource leak in temporary file manager.'
  # PR 752 JesseCorrington 'Integrate cpp fixture changes into develop'
  # PR 754 joshmoore 'Unload ofile before linking (Fix #10216)'
  # PR 755 sbesson 'Fix directory test when cleaning existing Homebrew taps (rebased onto develop)'

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.
Merged PRs:
  # PR 253 mtbc 'Fix code example for log level checking.'

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