Merge branch 'when-jinja' into 'master'

mysql/postgres: fix warning that when uses raw variables

See merge request !5
1 job for master in 33 seconds (queued for 14 seconds)