diff --git a/bower.json b/bower.json
index a5b0409ef..80e6235ca 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.6.313",
+  "version": "1.6.315",
   "main": [
     "build/pdf.js",
     "build/pdf.worker.js"
diff --git a/build/pdf.combined.js b/build/pdf.combined.js
index 47fd893cf..6374375bf 100644
--- a/build/pdf.combined.js
+++ b/build/pdf.combined.js
@@ -24,8 +24,8 @@
 }(this, function (exports) {
   // Use strict in our context only - users might not want it
   'use strict';
-  var pdfjsVersion = '1.6.313';
-  var pdfjsBuild = 'c23f124';
+  var pdfjsVersion = '1.6.315';
+  var pdfjsBuild = 'a139c75';
   var pdfjsFilePath = typeof document !== 'undefined' && document.currentScript ? document.currentScript.src : null;
   var pdfjsLibs = {};
   (function pdfjsWrapper() {
diff --git a/build/pdf.js b/build/pdf.js
index b89ffb2b2..2c6692601 100644
--- a/build/pdf.js
+++ b/build/pdf.js
@@ -24,8 +24,8 @@
 }(this, function (exports) {
   // Use strict in our context only - users might not want it
   'use strict';
-  var pdfjsVersion = '1.6.313';
-  var pdfjsBuild = 'c23f124';
+  var pdfjsVersion = '1.6.315';
+  var pdfjsBuild = 'a139c75';
   var pdfjsFilePath = typeof document !== 'undefined' && document.currentScript ? document.currentScript.src : null;
   var pdfjsLibs = {};
   (function pdfjsWrapper() {
diff --git a/build/pdf.worker.js b/build/pdf.worker.js
index bcf89aa11..32c17e6c3 100644
--- a/build/pdf.worker.js
+++ b/build/pdf.worker.js
@@ -24,8 +24,8 @@
 }(this, function (exports) {
   // Use strict in our context only - users might not want it
   'use strict';
-  var pdfjsVersion = '1.6.313';
-  var pdfjsBuild = 'c23f124';
+  var pdfjsVersion = '1.6.315';
+  var pdfjsBuild = 'a139c75';
   var pdfjsFilePath = typeof document !== 'undefined' && document.currentScript ? document.currentScript.src : null;
   var pdfjsLibs = {};
   (function pdfjsWrapper() {
diff --git a/package.json b/package.json
index bbac37ad4..8719b8f41 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.6.313",
+  "version": "1.6.315",
   "main": "build/pdf.js",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [
diff --git a/web/compatibility.js b/web/compatibility.js
index 2874bcb12..661241fde 100644
--- a/web/compatibility.js
+++ b/web/compatibility.js
@@ -457,16 +457,15 @@ if (typeof PDFJS === 'undefined') {
   // https://github.com/mozilla/pdf.js/issues/3260
   // Last tested with version 6.0.4.
   // Support: Safari 6.0+
-  var isSafari = Object.prototype.toString.call(
-                  window.HTMLElement).indexOf('Constructor') > 0;
+  var isSafari = /Safari\//.test(navigator.userAgent) &&
+                 !/(Chrome\/|Android\s)/.test(navigator.userAgent);
 
   // Older versions of Android (pre 3.0) has issues with range requests, see:
   // https://github.com/mozilla/pdf.js/issues/3381.
   // Make sure that we only match webkit-based Android browsers,
   // since Firefox/Fennec works as expected.
   // Support: Android<3.0
-  var regex = /Android\s[0-2][^\d]/;
-  var isOldAndroid = regex.test(navigator.userAgent);
+  var isOldAndroid = /Android\s[0-2][^\d]/.test(navigator.userAgent);
 
   // Range requests are broken in Chrome 39 and 40, https://crbug.com/442318
   var isChromeWithRangeBug = /Chrome\/(39|40)\./.test(navigator.userAgent);