Merge remote-tracking branch 'xypper-origin/master'