Change-Id: I3deb9ca4c015a1fc15c73a727c8f1ab78638ca7d Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>