Merged guitweaks (includes stuff from private branches