fix for calendar
Merge branch 'version_3_2' into version_3_3
promote!