more fixes for everyone
Merge branch 'DevDaxten' of git://github.com/Daxten/Questor into BleedingEdge