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 926 (OMERO.matlab: add raw data utility functions (see #10384) (rebased onto develop))
merge develop -D org -I include -E exclude: PR 938 (Big image rnd (rebased onto develop))
merge develop -D org -I include -E exclude: PR 941 (.travis.yml (take 2) and test fixes)
merge develop -D org -I include -E exclude: PR 945 (Handle null state on close in FileMaker (rebased onto develop))
merge develop -D org -I include -E exclude: PR 946 (Multi selection plate (rebased onto develop))
merge develop -D org -I include -E exclude: PR 947 (Increase checksum noting and matching for imports. (rebase))
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

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 926 sbesson 'OMERO.matlab: add raw data utility functions (see #10384) (rebased onto develop)'
  # PR 938 jburel 'Big image rnd (rebased onto develop)'
  # PR 941 joshmoore '.travis.yml (take 2) and test fixes'
  # PR 945 joshmoore 'Handle null state on close in FileMaker (rebased onto develop)'
  # PR 946 jburel 'Multi selection plate (rebased onto develop)'
  # PR 947 mtbc 'Increase checksum noting and matching for imports. (rebase)'
  # PR 951 joshmoore 'OMERO5DEV__3: fileset image linkage'
  # PR 954 snoopycrimecop 'Update develop submodules'

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 427 rleigh-dundee 'xsd-fu: Generate sources at build time'
  # PR 435 melissalinkert 'Fixes for March 2013 bug week (rebased onto develop)'

Repository: ome/scripts
Already up-to-date.
Merged PRs:
  # PR 22 mtbc 'Fix headers of scripts to match coding standard. (rebase)'

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 300 mtbc 'Add note about UTF-8 source code files. (rebase)'

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