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