Fixes Ticket1373 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from committags/n0.10.570f0ffa1ed) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commitd721cb009d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>