Merge branch 'develop' into 'master'

"Merge branch 'allevidence' into 'develop'"

See merge request !15
1 job for master in 2 seconds (queued for 6 seconds)