Change-Id: I30e76c3e0f96e7b70f0c9f70d5c241a41d1c7a5f Reviewed-by: David Schulz <david.schulz@digia.com>