Pull from upstream

Updating fork with upstream Tux2/GriefPrevention