Merge branch 'bugfixes' into 'master'

Bug Fixes

See merge request !11
2 jobs for master in 2 minutes and 29 seconds (queued for 2 seconds)