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