Work around #1780 (font corruption).
Merge commit 'e3879ab' into 0.8.2-beta
(work around #1780 font corruption).