Merge branch 'master' of github.com:jgm/pandoc-templates