60 Days Ago
Merge from manpad_fix