Merge branch 'master' into jc/fmt-patch