Merge branch 'master' into 'production'

Master

See merge request !50
1 job for 1.1.6 in 2 minutes and 23 seconds
latest