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 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: PR 781 (Chgrp disable fs)
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 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'
  # PR 781 jburel 'Chgrp disable fs'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 351 ctrueden 'Add SPW support to FakeReader'
  # PR 371 bjoernthiel 'put up reader for MPI-BPC Imspector files'
  # 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'
  # PR 386 melissalinkert 'ICS writer: fix channel count correction (rebased onto develop)'
  # PR 390 joshmoore 'Add slf4j-log4j dependency in the test-suite component (rebased onto develop)'
  # PR 392 melissalinkert 'Logging docfix (rebased onto develop)'
  # PR 394 ctrueden 'Make format tables sortable'
  # PR 396 hinerm 'Interleaved fixes'
Conflicting PRs (not included):
  # PR 391 melissalinkert 'Remove hard dependency on log4j (rebased onto develop)'

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

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 262 gusferguson 'Training develop'

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