Merge branch 'nkupdates3' into 'master'

Nkupdates3

See merge request wiaflos/wiaflos!31
2 jobs for master in 1 minute and 38 seconds (queued for 3 seconds)