Merging fix for bnc#798322 from 'master' to 'Webyast-1.3'