Fix typo in variable.
Merge branch '4.0'