Merge branch 'trigger' into 'master'

Trigger

See merge request !27
2 jobs for master in 19 seconds (queued for 1 minute and 19 seconds)