server commit
Merge remote-tracking branch 'origin/change-jinja-options'
Merge branch 'master' of https://github.com/aliyanno/wine-database