Merge branch 'fixes' into 'master'

Bug fixes

See merge request !13
3 jobs for master in 13 minutes and 51 seconds (queued for 3 seconds)
latest
Status Job ID Name Coverage
  Build
passed #116436
linux
build-linux

00:12:25

 
  Build Noarch
passed #116442
conda
build-noarch

00:01:26

failed #116437
conda
build-noarch

00:03:19