Merge branch 'develop' into 'master'

Develop

See merge request !22
2 jobs for 2.3 in 5 minutes and 41 seconds (queued for 7 seconds)