Jabulba/GriefPrevention — pull request #2 by Jabulba (2014-03-29 11:35:09+00:00)
Title: Pull from upstream

Hoping this works.... Pull recent updates from Tux2/master to Jabulba/master