Change-Id: I7e66136d2b75a932b981713ccc27e3e69fd44baa Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>