Fix typo which led to subtle bug.
Merge remote-tracking branch 'origin/master'