Merge branch 'development' into 'master'

Merge branch development into master (v1.0.2)

See merge request !41
7 jobs for master in 18 minutes and 9 seconds (queued for 2 seconds)