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 592 (C++ fixes for building with Ice >= 3.4)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 599 (scons: Update to version 2.2.0)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 617 (render_fs_speed_10183 (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 623 (Insight sprint2 (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 625 (Hcs tabular data (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 630 (BfPixelBuffer: preserve the series when a new BfPixelsWrapper is created)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 632 (Build speed-up (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 634 (Big images fs 9701 (develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 635 (FS sync: UnregisteredFileException)
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 592 rleigh-dundee 'C++ fixes for building with Ice >= 3.4'
  # PR 599 rleigh-dundee 'scons: Update to version 2.2.0'
  # PR 617 joshmoore 'render_fs_speed_10183 (rebased onto develop)'
  # PR 623 jburel 'Insight sprint2 (rebased onto develop)'
  # PR 625 jburel 'Hcs tabular data (rebased onto develop)'
  # PR 630 melissalinkert 'BfPixelBuffer: preserve the series when a new BfPixelsWrapper is created'
  # PR 632 joshmoore 'Build speed-up (rebased onto develop)'
  # PR 634 will-moore 'Big images fs 9701 (develop)'
  # PR 635 joshmoore 'FS sync: UnregisteredFileException'
Conflicting PRs (not included):
  # PR 631 jburel 'Handle correctly duplicate thumbnails (see #10225)'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 344 melissalinkert 'Sprint4.2 bug fixes develop'

Repository: ome/scripts
Already up-to-date.
Merged PRs:
  # PR 19 will-moore 'Split view merged 10109 (develop)'

Repository: openmicroscopy/ome-documentation
Updating dd7e4e5..91a86a6
Merged PRs:
  # PR 221 hflynn 'Fixing ticket 10174 (rebased onto develop)'

Generated by OMERO-merge-develop#124 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-develop/124/)