Merge branch 't/misc/surrogates' into refs/top-bases/gitweb-additions