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