fix
Merge branch 't6_ajax'
fix