Merge branch 'patch-3' into 'master'

Patch 3

See merge request !837
1 job from master in 2 minutes and 38 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Syntax
passed #364
syntax:lint

00:02:38