Change-Id: I94748c9fad017038d61ff5a231a8e5f081985cc0 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>