fix suse platform regression from d9c16689
Merge remote-tracking branch 'upstream/master'