daily clean bugfixes
Merge branch 'master' into kettle-deployment