Merge branch 'CBC_master' into 'CBC'

Fixing typo in setupdirs

See merge request !228
6 jobs for CBC in 45 seconds (queued for 8 seconds)