Note that there was a separate fix implemented for the font path issue. Can you re-merge upstream into your branch and fix that? Because a naive merge would result in paths like "data/font/data/fixedsys.ttf.ttf".