Fix a variable name typo
Merge branch 'wp35'