fix a profoundly stupid mistake from an earlier commit
Merge remote-tracking branch 'origin/master'