Merge branch 'master' into t6_widget
ticket:6 datepick widget fixes
Merge branch 't6_widget'