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 1338 (OMEROMetadataStoreClient: Complete unimplemented stubbed out methods)
merge develop -D org -I include -E exclude: PR 1339 (Rebased/dev 4 4/cli importer qa report dev 4 4)
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 1338 rleigh-dundee 'OMEROMetadataStoreClient: Complete unimplemented stubbed out methods'
  # PR 1339 zeb 'Rebased/dev 4 4/cli importer qa report dev 4 4'

Repository: openmicroscopy/bioformats
Updating 34aa07c..6c552f5
Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 556 bpindelski 'Add ``mkfake`` tool'
  # PR 596 melissalinkert 'Minor defensive programming changes for TIFF-based formats'
  # PR 597 melissalinkert 'Update OME-XML population to match 2013-06 changes'
  # PR 600 melissalinkert 'Allow a directory of OME-XML files to be specified for testEqualOMEXML'
  # PR 601 rleigh-dundee 'DeltavisionReader: Store exposure time in seconds, not kiloseconds'
  # PR 602 qidane 'Sample Generation and FLIM Sample'

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

Repository: openmicroscopy/ome-documentation
Updating 370b68f..da5dc8f
Merged PRs:
  # PR 369 rleigh-dundee 'Cpp: Correct content and markup'
  # PR 404 gusferguson 'Updating Download screenshots for Version 5 (FS)'
  # PR 415 qidane 'Add TypeDescription to the modulo page, see #10397'
  # PR 418 mtbc 'more Americanization (rebased onto develop)'
  # PR 419 hflynn 'Formats tidy'
  # PR 420 hflynn 'Removing xsd-fu &linking to new BF version instead'

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