Merge branch 'morefix2' into 'master'

cleanup

See merge request !10
2 jobs for master in 4 seconds (queued for 4 seconds)