Merge commit 'refs/top-bases/t/misc/blob_plain-charset' into t/misc/blob_plain-charset