Merge branch 'master' into prefix-directives