Merge branch 'master' into t6_widgets
ticket:6 tests
ticket:6 implementation
Merge branch 't6_widgets'