Minor, unimportant changes
Merge branch 'templatedMantis' of git://github.com/project8/mantis into templatedMantis