Merge pull request #1326 from snoopycrimecop/merge/develop/submodules

Update develop submodules
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 1342 (Python code examples and scripts for Paris develop)
merge develop -D org -I include -E exclude: PR 1357 (Import as bug develop)
merge develop -D org -I include -E exclude: PR 1359 (testGetTile() checks against getPlane(). See #11315)
merge develop -D org -I include -E exclude: PR 1361 (Add a hook so additional scripts can be run after creating VM)
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 1132 knabar 'Repository API'
  # PR 1324 joshmoore 'Jython scripts (See #918)'
  # PR 1342 will-moore 'Python code examples and scripts for Paris develop'
  # PR 1357 jburel 'Import as bug develop'
  # PR 1359 will-moore 'testGetTile() checks against getPlane(). See #11315'
  # PR 1361 manics 'Add a hook so additional scripts can be run after creating VM'
Conflicting PRs (not included):
  # PR 1366 aleksandra-tarkowska 'Use cache to serve up JPEG tiles.'

Repository: openmicroscopy/bioformats
Updating 6d5ea04..2de8157
Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 620 melissalinkert 'Add support for Lavision Imspector data'
  # PR 621 melissalinkert 'CellWorx: populate StartTime/EndTime on PlateAcquisition (rebased onto develop)'
  # PR 625 rleigh-dundee 'docs: Use XeLaTeX for PDF documentation (develop)'
  # PR 627 joshmoore 'Use `git describe` for Bio-Formats version (See #9639)'
  # PR 628 rleigh-dundee 'Convert all code to use joda-time'
  # PR 629 melissalinkert 'Override getValue() in OriginalMetadataAnnotation (rebased onto develop)'

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

Repository: openmicroscopy/ome-documentation
Updating c0a6db9..0779e44
Merged PRs:
  # PR 369 rleigh-dundee 'Cpp: Correct content and markup'

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