merge develop -D org -I include -E exclude: PR 1838 (Connection)
merge develop -D org -I include -E exclude: PR 1886 (Use python's json rather than Django's)
merge develop -D org -I include -E exclude: PR 1887 (Fix import exception window layout (see #11797).)
merge develop -D org -I include -E exclude: PR 1888 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1889 (Download crash)
merge develop -D org -I include -E exclude: PR 1890 (Fix units if value is 0.0)
merge develop -D org -I include -E exclude: PR 1891 (Group was excluded.)
merge develop -D org -I include -E exclude: PR 1892 (Plate download)
merge develop -D org -I include -E exclude: PR 1893 (Check that the correct component is visible.)
merge develop -D org -I include -E exclude: PR 1894 (Add DBUserCheck to create a Roles object from the DB (See #11813))
merge develop -D org -I include -E exclude: PR 1895 (Exclude some DEBUG logging from Blitz.log)
merge develop -D org -I include -E exclude: PR 1896 (Tag selection)
merge develop -D org -I include -E exclude: PR 1897 (Layout issue)
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 1880 bpindelski 'Use getThumbnail() to speed up import. (see #11783)' (label: exclude)
  # PR 1837 jburel 'Qa submit' (label: exclude)
  # PR 1385 manics 'Update the OMERO VirtualBox image' (label: exclude)
  # PR 1712 rleigh-dundee 'Create release source artifact containing all submodules' (label: exclude)
  # PR 1742 aleksandra-tarkowska '11591 user ip' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 1838 jburel 'Connection'
  # PR 1886 joshmoore 'Use python's json rather than Django's'
  # PR 1887 bpindelski 'Fix import exception window layout (see #11797).'
  # PR 1888 snoopycrimecop 'Update develop submodules'
  # PR 1889 jburel 'Download crash'
  # PR 1890 jburel 'Fix units if value is 0.0'
  # PR 1891 jburel 'Group was excluded.'
  # PR 1892 jburel 'Plate download'
  # PR 1893 jburel 'Check that the correct component is visible.'
  # PR 1894 joshmoore 'Add DBUserCheck to create a Roles object from the DB (See #11813)'
  # PR 1895 ximenesuk 'Exclude some DEBUG logging from Blitz.log'
  # PR 1896 jburel 'Tag selection'
  # PR 1897 jburel 'Layout issue'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
Updating a9f6b81..a016b8f
Merged PRs (fast-forward):
  # PR 818 melissalinkert 'Last round of fixes for Maven build system'
  # PR 819 melissalinkert 'Flex: map server-mapped files to the same directory as metadata files'
  # PR 820 joshmoore '7856 flim ann'
  # PR 824 melissalinkert 'Imspector: always set the modulo TypeDescription to "TCSPC"'

Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 825 melissalinkert 'bfopen: store both the global and series metadata in the returned array'
  # PR 826 rleigh-dundee 'cpp: Add metadata interfaces and implementations'
  # PR 827 melissalinkert 'Update format pages for 5.0.0-beta2'

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

Repository: openmicroscopy/ome-documentation
Updating 412e806..9d86ecb
Merged PRs (fast-forward):
  # PR 580 pwalczysko 'Exchange "Link" for user-friendlier "Mix data" cf. Gus's comment'
  # PR 582 will-moore 'update plugin options. See #11806'
  # PR 576 sbesson 'Review server upgrade and password provider pages'

Merged PRs:
  # PR 533 hflynn 'Removing BF anchor until it exists'
  # PR 573 sbesson 'Continous integration fixes'
  # PR 578 will-moore 'Django 1.6 for devs 11757'
  # PR 581 will-moore 'Doc running App from anywhere & CreateApp refactor'
  # PR 583 sbesson 'Improve description of CLI usage as a client'
  # PR 584 manics 'Web config docs 11723 11724'
  # PR 585 hflynn 'Removing swordfish as root password for VA (rebased onto develop)'

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