Merge branch 'master' into 'master'

v1.1.6 merge

See merge request !24
3 jobs for 1.1.6 in 3 minutes and 48 seconds (queued for 2 seconds)
latest