bug 1318: Variable name typo
bug 1318: Minor typo
Merge branch 'bug-1318' into testserver-stable