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