Upstream master

Ona's changes from recent months, works with kobocat-templates