merge develop -D org -I include -E exclude: PR 991 (Add support for Ice 3.5 (develop))
merge develop -D org -I include -E exclude: PR 1132 (Repository API)
merge develop -D org -I include -E exclude: PR 1324 (Jython scripts (See #918))
merge develop -D org -I include -E exclude: PR 1326 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1332 (OMERO.matlab: write text annotation functions (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1335 (remove the space from the importer artifact name (rebased onto develop))
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 991 rleigh-dundee 'Add support for Ice 3.5 (develop)'
  # PR 1132 knabar 'Repository API'
  # PR 1324 joshmoore 'Jython scripts (See #918)'
  # PR 1326 snoopycrimecop 'Update develop submodules'
  # PR 1332 sbesson 'OMERO.matlab: write text annotation functions (rebased onto develop)'
  # PR 1335 mtbc 'remove the space from the importer artifact name (rebased onto develop)'

Repository: openmicroscopy/bioformats
Updating 88783b1..9c2be4e
Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 583 melissalinkert 'Reduce the number of JAI ImageIO registrations'
  # PR 589 melissalinkert 'Zeiss LSM: use the longer display channel name'
  # PR 590 rleigh-dundee 'xsd-fu: Generalise language type mapping (3)'
  # PR 596 melissalinkert 'Minor defensive programming changes for TIFF-based formats'

Repository: ome/scripts
Already up-to-date.

Repository: openmicroscopy/ome-documentation
Updating ff33028..00af7fa
Merged PRs:
  # PR 369 rleigh-dundee 'Cpp: Correct content and markup'
  # PR 404 gusferguson 'Updating Download screenshots for Version 5 (FS)'
  # PR 412 sbesson 'Remove plonematch theme from OME documentation (rebased onto develop)'

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