Concatenated fixes in bugs.txt
Merge branch 'master' of https://github.com/alekhurst/CleanSlate