merging master branch back to suse branch #48

Closed fmherschel closed 6 years ago