Merge "Reduce the time it takes to decay the glow after a pull." into gingerbread