Merge branch 'CBC_master' into 'CBC'

Fixing typo in setupdirs

See merge request !228