Merge branch 'master' into dev

package.json

@@ -23,7 +23,7 @@
     "package": "gulp package",
     "package:windows": "gulp package:windows",
     "package:osx": "gulp package:osx",
-    "package:linux": "gulp build && build --platform linux --arch all -d deb",
+    "package:linux": "gulp build && build --platform linux --arch all",
     "package:all": "gulp package:all",
     "prettify": "gulp prettify",
     "installer": "node ./script/installer.js"
@@ -35,7 +35,7 @@
     "chai": "^3.5.0",
     "chai-as-promised": "^5.3.0",
     "del": "^2.2.0",
-    "electron-builder": "3.20.0",
+    "electron-builder": "5.2.1",
     "electron-connect": "^0.3.7",
     "electron-packager": "^7.0.1",
     "electron-prebuilt": "1.2.2",
@@ -62,7 +62,8 @@
     "app-bundle-id": "com.mattermost.desktop",
     "app-category-type": "public.app-category.productivity",
     "linux": {
-      "synopsis": "Mattermost Desktop"
+      "synopsis": "Mattermost Desktop",
+      "target": "deb"
     }
   },
   "directories": {