bug 1318: Typo in control structure
Merge branch 'bug-1318' into testserver-stable