merge dev_5_0 -D org: PR 2563 (Update dev_5_0 submodules)
merge dev_5_0 -D org: PR 2595 (12311 auto memory)
merge dev_5_0 -D org: PR 2596 (Groups users menu 12082)
merge dev_5_0 -D org: PR 2597 (Preview resize 12319)
merge dev_5_0 -D org: PR 2615 (Sphinx api improvements)
merge dev_5_0 -D org: PR 2622 (Fix Share service (see #11537).)
merge dev_5_0 -D org: PR 2629 (fix #11096: import directory uniqueness exception handling)
merge dev_5_0 -D org: PR 2634 (ROI improvements (rebased onto dev_5_0))
merge dev_5_0 -D org: PR 2639 (Event log queue)
merge dev_5_0 -D org: PR 2640 (Bugfix: Remove FileAnnotations when multiple images are selected (rebased onto dev_5_0))
merge dev_5_0 -D org: PR 2643 (permissions test matlab script)
merge dev_5_0 -D org: PR 2652 (12373 grid config)
merge dev_5_0 -D org: PR 2655 (fix #12362: allow group owner to change permission level)
merge dev_5_0 -D org

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2242 joshmoore 'Use mklink under Windows' (label: exclude)
  # PR 2607 will-moore 'Search web ui' (label: exclude)
  # PR 2591 sbesson 'Append linux to the Linux OMERO clients' (label: exclude)
  # PR 2653 joshmoore 'Server unit tests' (status: failure)
  # PR 2108 rleigh-dundee 'release-src includes bioformats version metadata' (label: exclude)
  # PR 2228 jburel 'Connection scifio' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 2563 snoopycrimecop 'Update dev_5_0 submodules'
  # PR 2595 joshmoore '12311 auto memory'
  # PR 2596 will-moore 'Groups users menu 12082'
  # PR 2597 will-moore 'Preview resize 12319'
  # PR 2615 sbesson 'Sphinx api improvements'
  # PR 2622 bpindelski 'Fix Share service (see #11537).'
  # PR 2629 mtbc 'fix #11096: import directory uniqueness exception handling'
  # PR 2634 dominikl 'ROI improvements (rebased onto dev_5_0)'
  # PR 2639 joshmoore 'Event log queue'
  # PR 2640 dominikl 'Bugfix: Remove FileAnnotations when multiple images are selected (rebased onto dev_5_0)'
  # PR 2643 bramalingam 'permissions test matlab script'
  # PR 2652 joshmoore '12373 grid config'
  # PR 2655 mtbc 'fix #12362: allow group owner to change permission level'

Repository: openmicroscopy/bioformats
Updating 623cd6d..edc30e2
Merged PRs (fast-forward):
  # PR 1159 melissalinkert 'First round of Nikon ND2 fixes'
  # PR 1160 joshmoore 'Make private class in DV reader public (see #12358) (rebased onto dev_5_0)'
  # PR 1139 imunro 'Fix for BH .Sdt meas mode 0 & 1 single pixel files & (unrelated) problem with dividing by increment count.'
  # PR 1150 melissalinkert 'Allow dist-matlab to run on Windows (rebased onto dev_5_0)'
  # PR 1157 hflynn 'Removing dead link from Minolta-MRW format page'
  # PR 1144 hflynn 'Updating Zeiss links'
  # PR 1151 hflynn 'Comstat2 link'
  # PR 1134 sbesson 'Add prefix to zip file produced by dist-bftools target'
  # PR 1140 hflynn 'Add 'show and edit on Github' to docs side menu'
  # PR 1143 joshmoore 'Memoizer errs'

Merged PRs:
  # PR 1146 sbesson 'bfsave: metadata improvements'
  # PR 1153 melissalinkert 'CZI: prevent AIOOB exception when populating position metadata'

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

Repository: openmicroscopy/ome-documentation
Updating c858dcf..957a28f
Merged PRs (fast-forward):
  # PR 820 hflynn 'OMERO Developer doc tidying'
  # PR 826 sbesson 'Search page tidying up'
  # PR 821 hflynn 'Schema links'
  # PR 818 bpindelski 'Add LDAP error message explanation. (rebased onto dev_5_0)'
  # PR 813 ximenesuk 'Update DropBox documentation'
  # PR 811 will-moore 'Webgateway mip 5150'
  # PR 815 manics 'Remove mapannotations'
  # PR 804 hflynn 'Adding example server setup page '
  # PR 808 sbesson 'Travis fix'

Merged PRs:
  # PR 830 sbesson 'Fix minor points on the Cpp page'
Conflicting PRs (not included):
  # PR 819 joshmoore '12311 auto memory docs'

Generated by OMERO-5.0-merge-push#45 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-push/45/)