merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 587 (Modulo retrieve (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 771 (Import notification)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 774 (Recursive delete and test cleanup)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 775 (Path display)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 777 (Fix FS moves (10380))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 778 (Fs image links cleanup)
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 587 jburel 'Modulo retrieve (rebased onto develop)'
  # PR 771 jburel 'Import notification'
  # PR 774 joshmoore 'Recursive delete and test cleanup'
  # PR 775 jburel 'Path display'
  # PR 777 joshmoore 'Fix FS moves (10380)'
  # PR 778 will-moore 'Fs image links cleanup'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 217 ctrueden 'Prairie fixes'
  # PR 342 melissalinkert 'setId performance improvements'
  # PR 351 ctrueden 'Add SPW support to FakeReader'
  # PR 378 rleigh-dundee 'Sprint5 bug fixes (develop)'
  # PR 380 ximenesuk 'Removing ndpi from readers list for fs demo'
  # PR 384 melissalinkert 'Imaris HDF: make the optimal tile size be more tile-shaped'

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

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

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