Merge branch 'tucal' into 'master'

Update base template

See merge request !5
4 jobs for master in 12 seconds