Merge commit 'refs/top-bases/t/misc/quot-hex' into t/misc/quot-hex