Fix syntax problem
Merge branch 'master' into gv-r32