merge develop -D org -I include -E exclude: PR 1324 (Jython scripts (See #918))
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 1385 (Update the OMERO VirtualBox image)
merge develop -D org -I include -E exclude: PR 1418 (Use Python 2.6 features unconditionally)
merge develop -D org -I include -E exclude: PR 1421 (Import as bug develop)
merge develop -D org -I include -E exclude: PR 1633 (Upgrade ICE jars to version 3.5.1)
merge develop -D org -I include -E exclude: PR 1638 (OmeroCpp: Add cmake build system to replace scons)
merge develop -D org -I include -E exclude: PR 1641 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1645 (Prevent changing originalfile.mimetype from 'Directory')
merge develop -D org -I include -E exclude: PR 1646 (OmeroWeb Django upgrade from 1.3.1 to 1.5.4)
merge develop -D org -I include -E exclude: PR 1647 (Fixing the drag behaviour on tiled images for IE (see #11555))
merge develop -D org -I include -E exclude: PR 1652 (Parse modulo and view moduloT)
merge develop -D org -I include -E exclude: PR 1653 (fix #11202: introduce suggestChecksumAlgorithm method to FS API)
merge develop -D org -I include -E exclude: PR 1656 (Image no binary)
merge develop -D org -I include -E exclude: PR 1658 (investigate #11123: disable nulling of fileset version info)
merge develop -D org -I include -E exclude: PR 1659 (clients builds)
merge develop -D org -I include -E exclude: PR 1660 (fix #10994: change how tree view adjusts current selection)
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 1359 will-moore 'testGetTile() checks against getPlane(). See #11315'
  # PR 1385 manics 'Update the OMERO VirtualBox image'
  # PR 1418 rleigh-dundee 'Use Python 2.6 features unconditionally'
  # PR 1421 jburel 'Import as bug develop'
  # PR 1633 rleigh-dundee 'Upgrade ICE jars to version 3.5.1'
  # PR 1638 rleigh-dundee 'OmeroCpp: Add cmake build system to replace scons'
  # PR 1641 snoopycrimecop 'Update develop submodules'
  # PR 1645 mtbc 'Prevent changing originalfile.mimetype from 'Directory''
  # PR 1646 knabar 'OmeroWeb Django upgrade from 1.3.1 to 1.5.4'
  # PR 1647 cneves 'Fixing the drag behaviour on tiled images for IE (see #11555)'
  # PR 1652 jburel 'Parse modulo and view moduloT'
  # PR 1653 mtbc 'fix #11202: introduce suggestChecksumAlgorithm method to FS API'
  # PR 1656 jburel 'Image no binary'
  # PR 1658 mtbc 'investigate #11123: disable nulling of fileset version info'
  # PR 1659 jburel 'clients builds'
  # PR 1660 mtbc 'fix #10994: change how tree view adjusts current selection'
Conflicting PRs (not included):
  # PR 1657 ximenesuk 'Update copyright and comments in Python integration tests (rebased onto develop)'

Repository: openmicroscopy/bioformats
Already up-to-date.

Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 644 melissalinkert 'Add support for writing ModuloAlong* annotations'
  # PR 745 sbesson 'Improve bfCheckJavaPath performance testing'
  # PR 748 melissalinkert 'Add support for Bio-Rad .scn files'
  # PR 753 melissalinkert 'Bug fixes for graphics formats'
  # PR 756 melissalinkert 'Fix SPW fake file detection'
  # PR 765 hinerm 'Eclipse: ignore gmaven'
Conflicting PRs (not included):
  # PR 749 rleigh-dundee 'cmake: Use git root as project root'

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

Repository: openmicroscopy/ome-documentation
Already up-to-date.

Merged PRs:
  # PR 450 rleigh-dundee 'omero: Python 2.6 is the minimum supported version'
  # PR 518 hflynn 'Add note for BF users redirected to upgrade (rebased)'

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