fix invalid namespace
Merge branch 'csanquer-fix-336'
Merge branch 'master' into develop