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