Merge branch 'en/unicode-in-refnames'