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