Merge branch 'master' into kettle-deployment

Conflicts:
changelog.txt