Update dev with recent updates from upstream Tux2/GriefPrevention