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