merge master -Dorg -Isbesson/ome-help:cname_staging -Snone: PR 10 (s/rendering adjustments/rendering settings)
merge master -Dorg -Isbesson/ome-help:cname_staging -Snone: branch sbesson:cname_staging
merge master -Dorg -Isbesson/ome-help:cname_staging -Snone

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

Merged PRs:
  # PR 10 kennethgillen 's/rendering adjustments/rendering settings'
Merged branches:
  # sbesson:cname_staging

Generated by OME-help-staging#15 (http://ci.openmicroscopy.org/job/OME-help-staging/15/)