Merge branch 'master' into cff-subr-sanitize