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 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 791 sbesson 'OMERO homebrew dependencies (rebased onto develop)'
Conflicting PRs (not included):
  # PR 782 jburel 'Group view 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 392 melissalinkert 'Logging docfix (rebased onto develop)'
  # PR 404 sbesson 'Add external list of broken URLs to linkcheck_ignore (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#164 (http://hudson.openmicroscopy.org.uk/job/SCC-merge/164/)