Merge branch 'master' into 2.0

setup.py

@@ -53,7 +53,7 @@ setup(
     entry_points={
         "console_scripts": [
             "gns3server = gns3server.main:main",
-            "gns3vmnet = utils.vmnet:main",
+            "gns3vmnet = gns3server.utils.vmnet:main",
         ]
     },
     packages=find_packages(".", exclude=["docs", "tests"]),