Do not allow to edit the channels during loading. (see #11142)
Remove LevelFilter from FILE appender.
Fix cancel all issue when folder selected.

The cancel button was not greyed when a folder was selected,
scanned and entries added to display.
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 1251 (Improve the logging during image import (see #11020))
merge develop -D org -I include -E exclude: PR 1269 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1270 (Show chgrp target tree if Projects OR Datasets exist. See #10917)
merge develop -D org -I include -E exclude: PR 1278 (Remove synchronization from insight connectors/gateway)
merge develop -D org -I include -E exclude: PR 1287 (Matlab examples fix (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1288 (11109 chgrp fails on links)
merge develop -D org -I include -E exclude: PR 1290 (change config property name away from fslite)
merge develop -D org -I include -E exclude: PR 1291 (Pass context to script helper (Fix #10970))
merge develop -D org -I include -E exclude: PR 1292 (Do not flush all thumbnails when refreshing.)
merge develop -D org -I include -E exclude: PR 1293 (Close import)
merge develop -D org -I include -E exclude: PR 1294 (making Group/User dropdown menu configurable, close #11120)
merge develop -D org -I include -E exclude: PR 1297 (Cancel all)
merge develop -D org -I include -E exclude: PR 1299 (Handle trans. range before filter (Fix #11017))
merge develop -D org -I include -E exclude: PR 1300 (Channel edit)
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 1251 bpindelski 'Improve the logging during image import (see #11020)'
  # PR 1269 snoopycrimecop 'Update develop submodules'
  # PR 1270 will-moore 'Show chgrp target tree if Projects OR Datasets exist. See #10917'
  # PR 1278 joshmoore 'Remove synchronization from insight connectors/gateway'
  # PR 1287 sbesson 'Matlab examples fix (rebased onto develop)'
  # PR 1288 joshmoore '11109 chgrp fails on links'
  # PR 1290 mtbc 'change config property name away from fslite'
  # PR 1291 joshmoore 'Pass context to script helper (Fix #10970)'
  # PR 1292 jburel 'Do not flush all thumbnails when refreshing.'
  # PR 1293 jburel 'Close import'
  # PR 1294 aleksandra-tarkowska 'making Group/User dropdown menu configurable, close #11120'
  # PR 1297 jburel 'Cancel all'
  # PR 1299 joshmoore 'Handle trans. range before filter (Fix #11017)'
  # PR 1300 jburel 'Channel edit'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 529 melissalinkert 'Still more bug fixes'
  # PR 548 melissalinkert 'SEQ: do not automatically pick up files with the .seq suffix'
  # PR 555 qidane 'Adding 2013-06 versions of the samples'
  # PR 556 bpindelski 'Add ``mkfake`` tool'
  # PR 559 qidane 'Complete revert of Image->Transform'

Repository: ome/scripts
Updating 5d80374..d0bcba0
Merged PRs:
  # PR 31 will-moore 'Don't allow jpeg export of Big images'

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 369 rleigh-dundee 'Cpp: Correct content and markup'
  # PR 393 mtbc 'don't mention FSlite anywhere'

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