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