Change-Id: I16275f2f289a78e3217d765934b999b188005c14 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>