Merge branch 'master' into 'master'

Master changes for 1.1.5 into production repo

See merge request !23
3 jobs for 1.1.5 in 1 minute and 31 seconds (queued for 6 seconds)
latest