Fix error with undefined variable, introduced by yesterday's commit.
(Stupid thinko.)
Merge remote-tracking branch 'upstream/master'