diff --git a/dist/lodash.compat.js b/dist/lodash.compat.js
index 1f9589af3..121312e04 100644
--- a/dist/lodash.compat.js
+++ b/dist/lodash.compat.js
@@ -3011,11 +3011,9 @@
       fromIndex = (fromIndex < 0 ? nativeMax(0, length + fromIndex) : fromIndex) || 0;
       if (isArray(collection)) {
         result = indexOf(collection, target, fromIndex) > -1;
-      }
-      else if (typeof length == 'number' && isString(collection)) {
-        result = collection.indexOf(target, fromIndex) > -1;
-      }
-      else {
+      } else if (typeof length == 'number') {
+        result = (isString(collection) ? collection.indexOf(target, fromIndex) : indexOf(collection, target, fromIndex)) > -1;
+      } else {
         baseEach(collection, function(value) {
           if (++index >= fromIndex) {
             return !(result = value === target);
@@ -6593,7 +6591,7 @@
   // expose Lo-Dash
   var _ = runInContext();
 
-  // some AMD build optimizers, like r.js, check for specific condition patterns like the following:
+  // some AMD build optimizers, like r.js, check for condition patterns like the following:
   if (typeof define == 'function' && typeof define.amd == 'object' && define.amd) {
     // Expose Lo-Dash to the global object even when an AMD loader is present in
     // case Lo-Dash was injected by a third-party script and not intended to be
diff --git a/dist/lodash.compat.min.js b/dist/lodash.compat.min.js
index eb1e06951..6dcc9e024 100644
--- a/dist/lodash.compat.min.js
+++ b/dist/lodash.compat.min.js
@@ -17,7 +17,7 @@ var g=n&&n.__bindData__;if(g)return!a||1&g[1]||(g[4]=u),!a&&1&g[1]&&(t|=8),!l||4
 var u=[];if(Le.enumPrototypes&&u.push('!(G&&n=="prototype")'),Le.enumErrorProps&&u.push('!(F&&(n=="message"||n=="name"))'),n.j&&n.f)r+="var C=-1,D=B[typeof t]&&v(t),u=D?D.length:0;while(++C<u){n=D[C];",u.length&&(r+="if("+u.join("&&")+"){"),r+=n.g+";",u.length&&(r+="}"),r+="}";else if(r+="for(n in t){",n.j&&u.push("m.call(t, n)"),u.length&&(r+="if("+u.join("&&")+"){"),r+=n.g+";",u.length&&(r+="}"),r+="}",Le.nonEnumShadows){for(r+="if(t!==A){var i=t.constructor,r=t===(i&&i.prototype),f=t===J?I:t===k?j:L.call(t),x=y[f];",k=0;7>k;k++)r+="n='"+n.h[k]+"';if((!(r&&x[n])&&m.call(t,n))",n.j||(r+="||(!x[n]&&t[n]!==A[n])"),r+="){"+n.g+"}";
 r+="}"}return(n.b||Le.nonEnumArgs)&&(r+="}"),r+=n.c+";return E",t=t("d,j,k,m,o,p,q,s,v,A,B,y,I,J,L",e+r+"}"),s(n),t(V,q,oe,ve,_,pt,qe,dt,n.f,ae,U,ze,M,ie,we)}function at(n){return yt(n)?Ce(n):{}}function it(n){return He[n]}function lt(){var t=(t=y.indexOf)===Rt?n:t;return t}function ft(n){var t,e;return!n||we.call(n)!=G||(t=n.constructor,vt(t)&&!(t instanceof t))||!Le.argsClass&&pt(n)||!Le.nodeClass&&f(n)?!1:Le.ownLast?(nr(n,function(n,t,r){return e=ve.call(r,t),!1}),false!==e):(nr(n,function(n,t){e=t
 }),e===v||ve.call(n,e))}function ct(n){return Ue[n]}function pt(n){return n&&typeof n=="object"?we.call(n)==$:!1}function st(n,t,e){var r=We(n),u=r.length;for(t=V(t,e,3);u--&&(e=r[u],false!==t(n[e],e,n)););return n}function gt(n){var t=[];return nr(n,function(n,e){vt(n)&&t.push(e)}),t.sort()}function ht(n){for(var t=-1,e=We(n),r=e.length,u={};++t<r;){var o=e[t];u[n[o]]=o}return u}function vt(n){return typeof n=="function"}function yt(n){return!(!n||!U[typeof n])}function mt(n){return typeof n=="number"||we.call(n)==W
-}function dt(n){return typeof n=="string"||we.call(n)==M}function _t(n){for(var t=-1,e=We(n),r=e.length,u=Ut(r);++t<r;)u[t]=n[e[t]];return u}function bt(n,t,e){var r=-1,u=lt(),o=n?n.length:0,a=!1;return e=(0>e?Ie(0,o+e):e)||0,qe(n)?a=-1<u(n,t,e):typeof o=="number"&&dt(n)?a=-1<n.indexOf(t,e):Xe(n,function(n){return++r<e?void 0:!(a=n===t)}),a}function wt(n,t,e){var r=!0;if(t=y.createCallback(t,e,3),qe(n)){e=-1;for(var u=n.length;++e<u&&(r=!!t(n[e],e,n)););}else Xe(n,function(n,e,u){return r=!!t(n,e,u)
+}function dt(n){return typeof n=="string"||we.call(n)==M}function _t(n){for(var t=-1,e=We(n),r=e.length,u=Ut(r);++t<r;)u[t]=n[e[t]];return u}function bt(n,t,e){var r=-1,u=lt(),o=n?n.length:0,a=!1;return e=(0>e?Ie(0,o+e):e)||0,qe(n)?a=-1<u(n,t,e):typeof o=="number"?a=-1<(dt(n)?n.indexOf(t,e):u(n,t,e)):Xe(n,function(n){return++r<e?void 0:!(a=n===t)}),a}function wt(n,t,e){var r=!0;if(t=y.createCallback(t,e,3),qe(n)){e=-1;for(var u=n.length;++e<u&&(r=!!t(n[e],e,n)););}else Xe(n,function(n,e,u){return r=!!t(n,e,u)
 });return r}function jt(n,t,e){var r=[];if(t=y.createCallback(t,e,3),qe(n)){e=-1;for(var u=n.length;++e<u;){var o=n[e];t(o,e,n)&&r.push(o)}}else Xe(n,function(n,e,u){t(n,e,u)&&r.push(n)});return r}function kt(n,t,e){if(t=y.createCallback(t,e,3),!qe(n)){var r;return Xe(n,function(n,e,u){return t(n,e,u)?(r=n,!1):void 0}),r}e=-1;for(var u=n.length;++e<u;){var o=n[e];if(t(o,e,n))return o}}function xt(n,t,e){if(t&&typeof e=="undefined"&&qe(n)){e=-1;for(var r=n.length;++e<r&&false!==t(n[e],e,n););}else Xe(n,t,e);
 return n}function Ct(n,t,e){var r=n,u=n?n.length:0;if(t=t&&typeof e=="undefined"?t:V(t,e,3),qe(n))for(;u--&&false!==t(n[u],u,n););else{if(typeof u!="number")var o=We(n),u=o.length;else Le.unindexedChars&&dt(n)&&(r=n.split(""));Xe(n,function(n,e,a){return e=o?o[--u]:--u,t(r[e],e,a)})}return n}function Et(n,t,e){var r=-1,u=n?n.length:0,o=Ut(typeof u=="number"?u:0);if(t=y.createCallback(t,e,3),qe(n))for(;++r<u;)o[r]=t(n[r],r,n);else Xe(n,function(n,e,u){o[++r]=t(n,e,u)});return o}function Ot(n,t,e){var u=-1/0,o=u;
 if(!t&&qe(n)){e=-1;for(var a=n.length;++e<a;){var i=n[e];i>o&&(o=i)}}else t=!t&&dt(n)?r:y.createCallback(t,e,3),Xe(n,function(n,e,r){e=t(n,e,r),e>u&&(u=e,o=n)});return o}function St(n,t,e,r){var u=3>arguments.length;if(t=V(t,r,4),qe(n)){var o=-1,a=n.length;for(u&&(e=n[++o]);++o<a;)e=t(e,n[o],o,n)}else Xe(n,function(n,r,o){e=u?(u=!1,n):t(e,n,r,o)});return e}function At(n,t,e,r){var u=3>arguments.length;return t=V(t,r,4),Ct(n,function(n,r,o){e=u?(u=!1,n):t(e,n,r,o)}),e}function It(n){var t=-1,e=n?n.length:0,r=Ut(typeof e=="number"?e:0);
diff --git a/dist/lodash.js b/dist/lodash.js
index 9a907e12e..98740742e 100644
--- a/dist/lodash.js
+++ b/dist/lodash.js
@@ -2661,11 +2661,9 @@
       fromIndex = (fromIndex < 0 ? nativeMax(0, length + fromIndex) : fromIndex) || 0;
       if (isArray(collection)) {
         result = indexOf(collection, target, fromIndex) > -1;
-      }
-      else if (typeof length == 'number' && isString(collection)) {
-        result = collection.indexOf(target, fromIndex) > -1;
-      }
-      else {
+      } else if (typeof length == 'number') {
+        result = (isString(collection) ? collection.indexOf(target, fromIndex) : indexOf(collection, target, fromIndex)) > -1;
+      } else {
         forOwn(collection, function(value) {
           if (++index >= fromIndex) {
             return !(result = value === target);
@@ -6227,7 +6225,7 @@
   // expose Lo-Dash
   var _ = runInContext();
 
-  // some AMD build optimizers, like r.js, check for specific condition patterns like the following:
+  // some AMD build optimizers, like r.js, check for condition patterns like the following:
   if (typeof define == 'function' && typeof define.amd == 'object' && define.amd) {
     // Expose Lo-Dash to the global object even when an AMD loader is present in
     // case Lo-Dash was injected by a third-party script and not intended to be
diff --git a/dist/lodash.min.js b/dist/lodash.min.js
index 29c700fa8..a2a6404ca 100644
--- a/dist/lodash.min.js
+++ b/dist/lodash.min.js
@@ -16,7 +16,7 @@ if(f!=q)return!1;var f=n.constructor,p=t.constructor;if(f!=p&&!(ht(f)&&f instanc
 }for(;++a<l;){var g=e[a],y=u?u(g,a,e):g;(r?!a||h[h.length-1]!==y:0>f(h,y))&&((u||v)&&h.push(y),s.push(g))}return v?(c(h.b),p(h)):u&&c(h),s}function ut(n){return function(t,e,r){var u={};e=Q.createCallback(e,r,3),r=-1;var o=t?t.length:0;if(typeof o=="number")for(;++r<o;){var a=t[r];n(u,a,e(a,r,t),t)}else y(t,function(t,r,o){n(u,t,e(t,r,o),o)});return u}}function ot(n,t,e,r,u,o){var a=1&t,i=2&t,f=4&t,l=8&t,c=16&t,p=32&t,s=n;if(!i&&!ht(n))throw new re;c&&!e.length&&(t&=-17,c=e=!1),p&&!r.length&&(t&=-33,p=r=!1);
 var v=n&&n.__bindData__;if(v)return!a||1&v[1]||(v[4]=u),!a&&1&v[1]&&(t|=8),!f||4&v[1]||(v[5]=o),c&&ge.apply(v[2]||(v[2]=[]),e),p&&ge.apply(v[3]||(v[3]=[]),r),v[1]|=t,ot.apply(null,v);if(!a||i||f||p||!(Fe.fastBind||je&&c))g=function(){var v=arguments,h=a?u:this;return c&&de.apply(v,e),p&&ge.apply(v,r),f&&v.length<o?(t|=16,ot(n,l?t:-4&t,v,null,u,o)):(i&&(n=h[s]),this instanceof g?(h=gt(n.prototype)?ke(n.prototype):{},v=n.apply(h,v),gt(v)?v:h):n.apply(h,v))};else{if(c){var h=[u];ge.apply(h,e)}var g=c?je.apply(n,h):je.call(n,u)
 }return Te(g,Re.call(arguments)),g}function at(n){return We[n]}function it(){var t=(t=Q.indexOf)===Dt?n:t;return t}function ft(n){var t,e;return n&&be.call(n)==q&&(t=n.constructor,!ht(t)||t instanceof t)?(d(n,function(n,t){e=t}),e===h||ve.call(n,e)):!1}function lt(n){return Pe[n]}function ct(n){return n&&typeof n=="object"?be.call(n)==B:!1}function pt(n,t,e){var r=qe(n),u=r.length;for(t=Z(t,e,3);u--&&(e=r[u],false!==t(n[e],e,n)););return n}function st(n){var t=[];return d(n,function(n,e){ht(n)&&t.push(e)
-}),t.sort()}function vt(n){for(var t=-1,e=qe(n),r=e.length,u={};++t<r;){var o=e[t];u[n[o]]=o}return u}function ht(n){return typeof n=="function"}function gt(n){return!(!n||!L[typeof n])}function yt(n){return typeof n=="number"||be.call(n)==z}function mt(n){return typeof n=="string"||be.call(n)==P}function _t(n){for(var t=-1,e=qe(n),r=e.length,u=Ht(r);++t<r;)u[t]=n[e[t]];return u}function bt(n,t,e){var r=-1,u=it(),o=n?n.length:0,a=!1;return e=(0>e?Ie(0,o+e):e)||0,ze(n)?a=-1<u(n,t,e):typeof o=="number"&&mt(n)?a=-1<n.indexOf(t,e):y(n,function(n){return++r<e?void 0:!(a=n===t)
+}),t.sort()}function vt(n){for(var t=-1,e=qe(n),r=e.length,u={};++t<r;){var o=e[t];u[n[o]]=o}return u}function ht(n){return typeof n=="function"}function gt(n){return!(!n||!L[typeof n])}function yt(n){return typeof n=="number"||be.call(n)==z}function mt(n){return typeof n=="string"||be.call(n)==P}function _t(n){for(var t=-1,e=qe(n),r=e.length,u=Ht(r);++t<r;)u[t]=n[e[t]];return u}function bt(n,t,e){var r=-1,u=it(),o=n?n.length:0,a=!1;return e=(0>e?Ie(0,o+e):e)||0,ze(n)?a=-1<u(n,t,e):typeof o=="number"?a=-1<(mt(n)?n.indexOf(t,e):u(n,t,e)):y(n,function(n){return++r<e?void 0:!(a=n===t)
 }),a}function dt(n,t,e){var r=!0;t=Q.createCallback(t,e,3),e=-1;var u=n?n.length:0;if(typeof u=="number")for(;++e<u&&(r=!!t(n[e],e,n)););else y(n,function(n,e,u){return r=!!t(n,e,u)});return r}function wt(n,t,e){var r=[];t=Q.createCallback(t,e,3),e=-1;var u=n?n.length:0;if(typeof u=="number")for(;++e<u;){var o=n[e];t(o,e,n)&&r.push(o)}else y(n,function(n,e,u){t(n,e,u)&&r.push(n)});return r}function jt(n,t,e){t=Q.createCallback(t,e,3),e=-1;var r=n?n.length:0;if(typeof r!="number"){var u;return y(n,function(n,e,r){return t(n,e,r)?(u=n,!1):void 0
 }),u}for(;++e<r;){var o=n[e];if(t(o,e,n))return o}}function kt(n,t,e){var r=-1,u=n?n.length:0;if(t=t&&typeof e=="undefined"?t:Z(t,e,3),typeof u=="number")for(;++r<u&&false!==t(n[r],r,n););else y(n,t);return n}function xt(n,t,e){var r=n?n.length:0;if(t=t&&typeof e=="undefined"?t:Z(t,e,3),typeof r=="number")for(;r--&&false!==t(n[r],r,n););else{var u=qe(n),r=u.length;y(n,function(n,e,o){return e=u?u[--r]:--r,t(o[e],e,o)})}return n}function Ct(n,t,e){var r=-1,u=n?n.length:0;if(t=Q.createCallback(t,e,3),typeof u=="number")for(var o=Ht(u);++r<u;)o[r]=t(n[r],r,n);
 else o=[],y(n,function(n,e,u){o[++r]=t(n,e,u)});return o}function Ot(n,t,e){var u=-1/0,o=u;if(!t&&ze(n)){e=-1;for(var a=n.length;++e<a;){var i=n[e];i>o&&(o=i)}}else t=!t&&mt(n)?r:Q.createCallback(t,e,3),kt(n,function(n,e,r){e=t(n,e,r),e>u&&(u=e,o=n)});return o}function Et(n,t){var e=-1,r=n?n.length:0;if(typeof r=="number")for(var u=Ht(r);++e<r;)u[e]=n[e][t];return u||Ct(n,t)}function It(n,t,e,r){if(!n)return e;var u=3>arguments.length;t=Z(t,r,4);var o=-1,a=n.length;if(typeof a=="number")for(u&&(e=n[++o]);++o<a;)e=t(e,n[o],o,n);
diff --git a/dist/lodash.underscore.js b/dist/lodash.underscore.js
index 9dd4bb0e2..4524bf91b 100644
--- a/dist/lodash.underscore.js
+++ b/dist/lodash.underscore.js
@@ -4627,7 +4627,7 @@
 
   /*--------------------------------------------------------------------------*/
 
-  // some AMD build optimizers, like r.js, check for specific condition patterns like the following:
+  // some AMD build optimizers, like r.js, check for condition patterns like the following:
   if (typeof define == 'function' && typeof define.amd == 'object' && define.amd) {
     // Expose Lo-Dash to the global object even when an AMD loader is present in
     // case Lo-Dash was injected by a third-party script and not intended to be
diff --git a/lodash.js b/lodash.js
index f8cf93c9b..c487fe78b 100644
--- a/lodash.js
+++ b/lodash.js
@@ -3030,11 +3030,9 @@
       fromIndex = (fromIndex < 0 ? nativeMax(0, length + fromIndex) : fromIndex) || 0;
       if (isArray(collection)) {
         result = indexOf(collection, target, fromIndex) > -1;
-      }
-      else if (typeof length == 'number' && isString(collection)) {
-        result = collection.indexOf(target, fromIndex) > -1;
-      }
-      else {
+      } else if (typeof length == 'number') {
+        result = (isString(collection) ? collection.indexOf(target, fromIndex) : indexOf(collection, target, fromIndex)) > -1;
+      } else {
         baseEach(collection, function(value) {
           if (++index >= fromIndex) {
             return !(result = value === target);
@@ -6617,7 +6615,7 @@
   // expose Lo-Dash
   var _ = runInContext();
 
-  // some AMD build optimizers, like r.js, check for specific condition patterns like the following:
+  // some AMD build optimizers, like r.js, check for condition patterns like the following:
   if (typeof define == 'function' && typeof define.amd == 'object' && define.amd) {
     // Expose Lo-Dash to the global object even when an AMD loader is present in
     // case Lo-Dash was injected by a third-party script and not intended to be
diff --git a/vendor/benchmark.js/benchmark.js b/vendor/benchmark.js/benchmark.js
index 9b2b94a07..037d8ee08 100644
--- a/vendor/benchmark.js/benchmark.js
+++ b/vendor/benchmark.js/benchmark.js
@@ -2841,7 +2841,7 @@
   /*--------------------------------------------------------------------------*/
 
   // expose Benchmark
-  // some AMD build optimizers, like r.js, check for specific condition patterns like the following:
+  // some AMD build optimizers, like r.js, check for condition patterns like the following:
   if (typeof define == 'function' && typeof define.amd == 'object' && define.amd) {
     // define as an anonymous module so, through path mapping, it can be aliased
     define(['lodash', 'platform'], function(_, platform) {
diff --git a/vendor/platform.js/platform.js b/vendor/platform.js/platform.js
index a11a5ac46..62cf73fa0 100644
--- a/vendor/platform.js/platform.js
+++ b/vendor/platform.js/platform.js
@@ -986,7 +986,7 @@
   /*--------------------------------------------------------------------------*/
 
   // expose platform
-  // some AMD build optimizers, like r.js, check for specific condition patterns like the following:
+  // some AMD build optimizers, like r.js, check for condition patterns like the following:
   if (typeof define == 'function' && typeof define.amd == 'object' && define.amd) {
     // define as an anonymous module so, through path mapping, it can be aliased
     define(function() {