What was the point of *that*?
Rename weird variable names
Merge branch 'master' into next