References: https://bugzilla.opensuse.org/show_bug.cgi?id=1186267
I propose this patch for all branches.