Merge remote-tracking branch 'ups/master' into eslint

package.json

@@ -42,7 +42,7 @@
     "@types/glob": "^5.0.35",
     "@types/jsdom": "11.0.1",
     "@types/mocha": "^2.2.33",
-    "@types/node": "6.0.108",
+    "@types/node": "^10.17.17",
     "@types/utf8": "^2.1.6",
     "@types/webpack": "^4.4.11",
     "@types/ws": "^6.0.1",

src/common/services/CoreMouseService.ts

@@ -6,6 +6,7 @@ import { IBufferService, ICoreService, ICoreMouseService } from 'common/services
 import { EventEmitter, IEvent } from 'common/EventEmitter';
 import { ICoreMouseProtocol, ICoreMouseEvent, CoreMouseEncoding, CoreMouseEventType, CoreMouseButton, CoreMouseAction } from 'common/Types';
 
+// Disable naming convention as this file uses non-standard naming and it might be dangerous to change it
 /* eslint-disable @typescript-eslint/naming-convention */
 
 /**