Pull request stuff (mostly getting rid of <CR>
Merge branch 'hp-bars' of https://github.com/crazy2be/buildblast into hp-bars
Merge.