Merge branch 'nkupdates' into 'master'

Nkupdates

See merge request !50
4 jobs for v0.8.13 in 2 minutes and 36 seconds (queued for 3 seconds)
latest