Merge branch 'master' of git.cs.lth.se:noricc/jbrainy