Merge branch 'master' into master

Author: jornbh

nrfutil.spec

@@ -17,7 +17,7 @@ if (sys.platform == "win32"):
     module_ant = importlib.import_module('antlib')
     mod_dir_ant = os.path.dirname(module_ant.__file__)
     shlib_dir_ant = os.path.abspath(mod_dir_ant)
-    datas.append((shlib_dir_ant, '.'))
+    datas.append((shlib_dir_ant, 'antlib'))
 
 nrfutil_path = os.path.dirname(os.path.abspath(SPEC))
 datas.append((os.path.join(nrfutil_path, "libusb", "x64", "libusb-1.0.dylib"), os.path.join("libusb", "x64")))