mangled the variable names when moving code around
Merge branch 'a1400' into webplugin