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