merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 634 (Big images fs 9701 (develop))
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 712 (Import bugs develop)
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 723 (Blitz getThumbnail() uses cached thumbs (not Direct) if possible)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 726 (Use MIASReader.parseMasks (Fix #10170))
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 733 (Modify default Homebrew installation directory to /usr/local (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 734 (Add documentation to build.xml for build.py changes (Fix #10254) (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 735 (Clean up minor typos, no change in behavior (rebase).)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 736 (Update AssumeNG version)
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

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 634 will-moore 'Big images fs 9701 (develop)'
  # PR 693 ximenesuk 'Fs import notifications'
  # PR 712 jburel 'Import bugs develop'
  # PR 722 joshmoore 'Fix DropBox on Linux (Fix #9156) (rebased onto develop)'
  # PR 723 will-moore 'Blitz getThumbnail() uses cached thumbs (not Direct) if possible'
  # PR 726 joshmoore 'Use MIASReader.parseMasks (Fix #10170)'
  # 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 733 sbesson 'Modify default Homebrew installation directory to /usr/local (rebased onto develop)'
  # PR 734 joshmoore 'Add documentation to build.xml for build.py changes (Fix #10254) (rebased onto develop)'
  # PR 735 mtbc 'Clean up minor typos, no change in behavior (rebase).'
  # PR 736 bpindelski 'Update AssumeNG version'
  # PR 738 sbesson 'Matlab toolbox cleanup (rebased onto develop)'
  # PR 743 jburel 'Download original file fs'

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 377 bpindelski 'Update AssumeNG to official build'
  # PR 378 rleigh-dundee 'Sprint5 bug fixes (develop)'

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

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 252 hflynn 'Developer doc tidying 2 rebased'

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