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