Merge branch 'master' into t6_ajax
ticket:6 Fixed widget test
Merge branch 't6_ajax'