Signed-off-by: Janne Grunau janne-fdr@jannau.net
rebased onto 7234fcdf6fc60cc92f4a9f6c39d7d3d13fdaf68e
Pull-Request has been merged by dcavalca
Signed-off-by: Janne Grunau janne-fdr@jannau.net