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 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: PR 787 (Disable chgrp)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 789 (Fs delete)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 790 (Delete /Image remove duplicate Filesets)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 791 (OMERO homebrew dependencies (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 587 jburel 'Modulo retrieve (rebased onto develop)'
  # PR 778 will-moore 'Fs image links cleanup'
  # PR 781 jburel 'Chgrp disable fs'
  # PR 787 will-moore 'Disable chgrp'
  # PR 789 jburel 'Fs delete'
  # PR 790 will-moore 'Delete /Image remove duplicate Filesets'
  # PR 791 sbesson 'OMERO homebrew dependencies (rebased onto develop)'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 351 ctrueden 'Add SPW support to FakeReader'
  # PR 380 ximenesuk 'Removing ndpi from readers list for fs demo'
  # PR 390 joshmoore 'Add slf4j-log4j dependency in the test-suite component (rebased onto develop)'
  # PR 401 melissalinkert 'Trestle fixes (rebased onto develop)'
  # PR 402 melissalinkert 'Metamorph: fix erroneous channel counts (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'
  # PR 265 sbesson 'Review the Homebrew installation page (rebased onto develop)'

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