version.txt: Whoops! This still said CATSFC!
Merge branch 'master' into basic-blocks