Last uppdate from accenture

Signed-off-by: Aleksander Kolaas <aleksander@kolaas.no>