Merge remote-tracking branch 'refs/remotes/origin/master' into release/v1.0.40

Author: mathurf

core/core_api.yml

@@ -14,4 +14,4 @@
 location:
   type: app_store
   name: tk-core
-  version: v0.18.96
+  version: v0.18.97

env/includes/common/engines.yml

@@ -51,7 +51,7 @@ common.engines.tk-flame.location:
 common.engines.tk-desktop.location:
     type: app_store
     name: tk-desktop
-    version: v2.3.4
+    version: v2.3.6
 
 # Shell
 common.engines.tk-shell.location:

env/includes/common/frameworks.yml

@@ -39,6 +39,6 @@ frameworks:
       name: tk-framework-widget
   tk-framework-desktopserver_v1.x.x:
     location:
-      version: v1.1.11
+      version: v1.1.14
       type: app_store
       name: tk-framework-desktopserver