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: PR 795 (Don't exclude 'system' from groups in drop-down)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 796 (Fix Group list_users function to allow root id (0) to be parsed (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 778 will-moore 'Fs image links cleanup'
  # PR 791 sbesson 'OMERO homebrew dependencies (rebased onto develop)'
  # PR 795 will-moore 'Don't exclude 'system' from groups in drop-down'
  # PR 796 sbesson 'Fix Group list_users function to allow root id (0) to be parsed (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 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 268 hflynn 'User docs develop'
  # PR 269 sbesson 'Add section about the Sphinx linkcheck output parsing (rebased onto develop)'

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