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