Change-Id: Ib4f65eb0b63fdcb03468d28bf6c65a50074182bb
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>