Merge branch 'nkupdates' into 'master'

Fixed undefined reference

See merge request !51
2 jobs for master in 3 minutes and 30 seconds (queued for 3 seconds)