Bugfix for bnc#846011 | Backport for openSUSE-13.1

Backport from factory.