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