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