Merge branch 'bugfixes' into 'master'

Bugfixes

See merge request !7
2 jobs for master
in 3 minutes and 37 seconds and was queued for 2 seconds