Merge branch 'trains' into 'master'

Trains

See merge request !2
2 jobs for master in 16 seconds (queued for 1 second)
Status Job ID Name Coverage
  Configure
passed #104582
linux
configure-linux

00:00:02

 
  Compile
passed #104583
linux
make-linux

00:00:14