bug 1318: typo in variable names
Merge branch 'bug-1318' into testserver-stable