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