Merge fix for bnc#895023 into master