Revert previous font resolution fix, restore @mbx's version
Add missing semicolons when escaping static text
Merge pull request #1473 from tobytailor/nat

Misc