Merge in latest devel changes (clime theme and proxy example)

Oliver Falkrequested to merge
devel into master

Merge request reports