Merge branch 'cvs-cleanup' into 'master'

CVS cleanup

See merge request !2
2 jobs for master in 2 minutes and 53 seconds (queued for 7 seconds)