compile error repaired #829
Merge branch 'master' into voice