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