Merge branch '3.8' into 4.0-beta

Note: the following files were resoluved using ours (4.0-beta state):
- spine-ts/build/spine-all.js.map
- spine-ts/build/spine-player.js.map

spine-ts/build/spine-all.js

@@ -13358,7 +13358,7 @@ var spine;
 					skeletonData = json.readSkeletonData(jsonText);
 				}
 				catch (e) {
-					this.showError("Error: could not load skeleton .json.<br><br>" + escapeHtml(JSON.stringify(e)));
+					this.showError("Error: could not load skeleton .json.<br><br>" + e.toString());
 					return;
 				}
 			}
@@ -13369,7 +13369,7 @@ var spine;
 					skeletonData = binary.readSkeletonData(binaryData);
 				}
 				catch (e) {
-					this.showError("Error: could not load skeleton .skel.<br><br>" + escapeHtml(JSON.stringify(e)));
+					this.showError("Error: could not load skeleton .skel.<br><br>" + e.toString());
 					return;
 				}
 			}

spine-ts/build/spine-player.js

@@ -12669,7 +12669,7 @@ var spine;
 					skeletonData = json.readSkeletonData(jsonText);
 				}
 				catch (e) {
-					this.showError("Error: could not load skeleton .json.<br><br>" + escapeHtml(JSON.stringify(e)));
+					this.showError("Error: could not load skeleton .json.<br><br>" + e.toString());
 					return;
 				}
 			}
@@ -12680,7 +12680,7 @@ var spine;
 					skeletonData = binary.readSkeletonData(binaryData);
 				}
 				catch (e) {
-					this.showError("Error: could not load skeleton .skel.<br><br>" + escapeHtml(JSON.stringify(e)));
+					this.showError("Error: could not load skeleton .skel.<br><br>" + e.toString());
 					return;
 				}
 			}

spine-ts/player/src/Player.ts

@@ -867,7 +867,7 @@ module spine {
 				try {
 					skeletonData = json.readSkeletonData(jsonText);
 				} catch (e) {
-					this.showError("Error: could not load skeleton .json.<br><br>" + escapeHtml(JSON.stringify(e)));
+					this.showError("Error: could not load skeleton .json.<br><br>" + e.toString());
 					return;
 				}
 			} else {
@@ -876,7 +876,7 @@ module spine {
 				try {
 					skeletonData = binary.readSkeletonData(binaryData);
 				} catch (e) {
-					this.showError("Error: could not load skeleton .skel.<br><br>" + escapeHtml(JSON.stringify(e)));
+					this.showError("Error: could not load skeleton .skel.<br><br>" + e.toString());
 					return;
 				}
 			}