Update submodules
merge develop -D org -I include -E exclude: PR 898 (Bulk annotations for web image viewer, rebased onto develop)
merge develop -D org -I include -E exclude: PR 912 (Add Bio-Formats' turbojpeg artifact to the classpath)
merge develop -D org -I include -E exclude: PR 951 (OMERO5DEV__3: fileset image linkage)
merge develop -D org -I include -E exclude: PR 954 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 958 (Add remaining checksum algorithms (develop))
merge develop -D org -I include -E exclude: PR 961 (Basic test of Blitz fileset methods. See #10613)
merge develop -D org -I include -E exclude: PR 962 (Big image birdeyeview (rebased onto develop))
merge develop -D org -I include -E exclude: PR 964 (OMERO.matlab: add delete functions (see #10386) (rebased onto develop))
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 898 knabar 'Bulk annotations for web image viewer, rebased onto develop'
  # PR 912 melissalinkert 'Add Bio-Formats' turbojpeg artifact to the classpath'
  # PR 951 joshmoore 'OMERO5DEV__3: fileset image linkage'
  # PR 954 snoopycrimecop 'Update develop submodules'
  # PR 958 bpindelski 'Add remaining checksum algorithms (develop)'
  # PR 961 will-moore 'Basic test of Blitz fileset methods. See #10613'
  # PR 962 jburel 'Big image birdeyeview (rebased onto develop)'
  # PR 964 sbesson 'OMERO.matlab: add delete functions (see #10386) (rebased onto develop)'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 159 melissalinkert 'Improve .ndpi support'
  # PR 351 ctrueden 'Add SPW support to FakeReader'
  # PR 421 melissalinkert 'Documentation for new Imspector format'
  # PR 424 qidane 'Specification changes for 2013-06 release'
  # PR 433 melissalinkert 'More .nd2 fixes (rebased onto develop)'
Conflicting PRs (not included):
  # PR 438 melissalinkert 'Fix the autogenerated metadata field counts (rebased onto develop)'

Repository: ome/scripts
Already up-to-date.
Merged PRs:
  # PR 23 will-moore 'Kymograph 8206_develop'
  # PR 25 will-moore 'Combine imgs 9747 develop'

Repository: openmicroscopy/ome-documentation
Already up-to-date.

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