Handle correctly to void duplicate thumbnails (see #10225)
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 606 (Jshint compliance 9927 (develop))
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 622 (Fix import bugs. (see #9860, #9859) (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 624 (Check if the file still exists before downloading (see #9645))
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 628 (Editinplace bugs (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 631 (Handle correctly duplicate thumbnails (see #10225))
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 606 will-moore 'Jshint compliance 9927 (develop)'
  # PR 617 joshmoore 'render_fs_speed_10183 (rebased onto develop)'
  # PR 622 jburel 'Fix import bugs. (see #9860, #9859) (rebased onto develop)'
  # PR 623 jburel 'Insight sprint2 (rebased onto develop)'
  # PR 624 jburel 'Check if the file still exists before downloading (see #9645)'
  # PR 625 jburel 'Hcs tabular data (rebased onto develop)'
  # PR 628 will-moore 'Editinplace bugs (develop)'
  # PR 630 melissalinkert 'BfPixelBuffer: preserve the series when a new BfPixelsWrapper is created'
  # PR 631 jburel 'Handle correctly duplicate thumbnails (see #10225)'
Conflicting PRs (not included):
  # PR 629 scottlittlewood 'Insight import location develop'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 159 melissalinkert 'Improve .ndpi support'
  # 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..1363092
Merged PRs:
  # PR 218 bpindelski 'Make the copyright date the current year (rebased onto develop)'
  # PR 220 sbesson 'Continuous integration (rebased onto develop)'

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