Merge branch 'v0.8.5' into 'master'

V0.8.5

See merge request !141
2 jobs for v0.8.5 in 31 seconds (queued for 3 seconds)