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

2 jobs for revealjs in 59 seconds (queued for 1 second)