Incorporate changes from pandoc-templates 1.13.1