Merge branch 'stable-3.1'

1 job for master in 3 minutes and 18 seconds (queued for 4 minutes and 59 seconds)
Status Name Job ID Coverage
  Syntax
passed syntax:lint #26

00:03:18