Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 7865a39900)
7865a39900