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 1335 (remove the space from the importer artifact name (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1338 (OMEROMetadataStoreClient: Complete unimplemented stubbed out methods)
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 1335 mtbc 'remove the space from the importer artifact name (rebased onto develop)'
  # PR 1338 rleigh-dundee 'OMEROMetadataStoreClient: Complete unimplemented stubbed out methods'

Repository: openmicroscopy/bioformats
Updating 9c2be4e..34aa07c
Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 556 bpindelski 'Add ``mkfake`` tool'
  # PR 589 melissalinkert 'Zeiss LSM: use the longer display channel name'
  # PR 596 melissalinkert 'Minor defensive programming changes for TIFF-based formats'
  # PR 597 melissalinkert 'Update OME-XML population to match 2013-06 changes'
  # PR 598 melissalinkert 'Add page documenting how to use xsd-fu'

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

Repository: openmicroscopy/ome-documentation
Updating 00af7fa..370b68f
Merged PRs:
  # PR 369 rleigh-dundee 'Cpp: Correct content and markup'
  # PR 404 gusferguson 'Updating Download screenshots for Version 5 (FS)'
  # PR 413 zeb 'Rebased/develop/doc patch importer cli dev 4 4'
  # PR 414 zeb 'Rebased/develop/doc patch dropbox dev 4 4'
  # PR 415 qidane 'Add TypeDescription to the modulo page, see #10397'

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