Merge branch 'master' into 'master'

v1.1.4

See merge request !21
3 jobs for 1.1.4 in 3 minutes and 58 seconds (queued for 7 seconds)
latest