Merge branch 'bugfix/f33-oom' into 'master'

Fedora 33: reduce concurrency

See merge request !15
48 jobs for master in 54 minutes and 5 seconds (queued for 5 seconds)