Fix FTBFS introduced by ddb61e60
Merge remote-tracking branch 'upstream/master'