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