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