Merge remote-tracking branch 'upstream/master' into proactive_asset_c…

…leaning

Merge pull request #2579 from Jagget/Support-loading-font-file-from-.…

…dfmod

Support loading font file from .dfmod

Merge pull request #2646 from Jagget/QuestListsManager.GetQuest

Fix for QuestListsManager.GetQuest (allow it to get loose quests in packed mods)

Merge pull request #2633 from ajrb/noEncumbranceInTemplates

Move the hardcoding of items that don't encumber into templates