Jabulba/GriefPrevention — pull request #4 by Jabulba (2014-04-08 17:46:00+00:00)
Title: Pull from upstream

If I get this wrong again, shame on me...

Pull recent updates from Tux2/master to Jabulba/master