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