Now based on 6.12.61 (from 6.12.41)
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
(cherry picked from commit 1f5a9ab0837accd519484259f436763c93218fba)
Signed-off-by: Thomas Perale <thomas.perale@mind.be>