Merge remote-tracking branch 'template/master' into revealjs

2 jobs for revealjs in 1 minute (queued for 2 seconds)