6 Months Ago
Merge from paint_stroke_fix