Merge "Use ES5 String.prototype.trim() instead of jQuery.trim()"