This resolves bug 2308. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit e044c54633)
e044c54633