Backport to 2.1+
Fixed minor bug on 2.1+ backport
SimpleMonthView conflict resolved