Merge branch 'master' into 'production'

Master

See merge request !39
1 job for 1.1.4 in 2 minutes and 43 seconds (queued for 3 minutes and 56 seconds)
latest