quick fix
Merge branch 'version_3_1' into version_3_2
quick fix for statistics