Merge branch 'bug_fix' into 'master'

Bug fix

See merge request !5
2 jobs for master in 1 minute and 35 seconds (queued for 2 seconds)