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