Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com> (cherry picked from committags/n0.5.75a19acb17c) Signed-off-by: Reinhard Tartler <siretart@tauware.de> (cherry picked from commit0d93d5c461) Signed-off-by: Reinhard Tartler <siretart@tauware.de>