Rename a variable I missed.
Merge branch 'master' into with-comments