ticket:6 fixes
Merge branch 't6_calendar_widget' to 'master'