Didn't rename these variables.
Merge remote-tracking branch 'remotes/origin/lowjoel-standalone-script'