Pull from upstream

for reference: TO fork ... FROM fork

Pull recent updates from upstream Tux2/GriefPrevention