2 Years Ago
Merge from paint_stroke_fix