Merge remote-tracking branch 'origin/master' into resolve_1_9_2_merge_conflict

Author: jjw24

Plugins/Flow.Launcher.Plugin.Shell/plugin.json

@@ -9,4 +9,4 @@
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Shell.dll",
   "IcoPath": "Images\\shell.png"
-}
+}