First pass at render_performance page in webtest
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 577 (9821 Major FS refactoring)
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 602 (Roi test develop)
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 613 (Channel edit (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 614 (Fix NPE after editing and not saving (close #10164) (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 615 (Pyramid reader: do not override initFile (rebased onto 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

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 577 joshmoore '9821 Major FS refactoring'
  # 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 602 jburel 'Roi test develop'
  # PR 606 will-moore 'Jshint compliance 9927 (develop)'
  # PR 613 jburel 'Channel edit (rebased onto develop)'
  # PR 614 jburel 'Fix NPE after editing and not saving (close #10164) (rebased onto develop)'
  # PR 615 melissalinkert 'Pyramid reader: do not override initFile (rebased onto develop)'
  # PR 617 joshmoore 'render_fs_speed_10183 (rebased onto develop)'

Repository: openmicroscopy/bioformats
Updating 55cf7fd..0afaf55
Merged PRs:
  # PR 340 melissalinkert 'Use better schema documentation links (rebased onto develop)'
  # PR 344 melissalinkert 'Sprint4.2 bug fixes develop'

Repository: ome/scripts
Updating 457e85a..272c83a

Repository: openmicroscopy/ome-documentation
Updating 2e32665..4716c77
Merged PRs:
  # PR 211 hflynn 'Sysadmin docs tidy (rebased onto develop)'
  # PR 213 manics 'Tables documentation partial rewrite 9957 (rebased onto develop)'
  # PR 214 jburel 'Fixed forward declartion incomplete type error in c++ example code (rebased onto develop)'

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