Fixed repeated-variable error.

Instead of using both variables in a pair, the same one was used twice.
Merge remote-tracking branch 'upstream/master'