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