merge develop -D org -I include -E exclude: PR 1324 (Jython scripts (See #918))
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: PR 1366 (Use cache to serve up JPEG tiles.)
merge develop -D org -I include -E exclude: PR 1377 (Insight tidyup (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1378 (Remove eman tests (rebased on develop))
merge develop -D org -I include -E exclude: PR 1381 (Insight thumbnail white border (rebased onto develop))
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 1324 joshmoore 'Jython scripts (See #918)'
  # 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'
  # PR 1366 aleksandra-tarkowska 'Use cache to serve up JPEG tiles.'
  # PR 1377 mtbc 'Insight tidyup (rebased onto develop)'
  # PR 1378 ximenesuk 'Remove eman tests (rebased on develop)'
  # PR 1381 mtbc 'Insight thumbnail white border (rebased onto develop)'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 628 rleigh-dundee 'Convert all code to use joda-time'

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

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 369 rleigh-dundee 'Cpp: Correct content and markup'
  # PR 434 hflynn 'Data Model & OME-TIFF Docs rework'
  # PR 437 rleigh-dundee 'Generate PDF using XeLaTeX'
  # PR 438 hflynn 'Permissions develop'
  # PR 439 jburel 'Brew install develop'

Generated by SCC-merge#319 (http://hudson.openmicroscopy.org.uk/job/SCC-merge/319/)