Merge branch 'master' into westmann/issue454