Merge branch 'issue255' into 'develop'

Issue255

See merge request !9
3 jobs for v0.8.2 in 6 minutes and 46 seconds (queued for 3 seconds)
latest