Merge branch 'master' of git.app.uib.no:itpublic/dockerimages/centosfpmcookery

1 job for master in 3 minutes and 35 seconds (queued for 3 seconds)