Merge branch 'master' into clifford/fix1255