Srizna's changes
Merge branch 'jasman' of https://github.com/Suneal/progit into jasman