Webfonts fix dev

Repost of earlier fix for webfonts. Now on the dev branch.