diff --git a/cms/static/js/certificates/views/signatory_editor.js b/cms/static/js/certificates/views/signatory_editor.js
index 2bd6e2f890ab..d446ea630f26 100644
--- a/cms/static/js/certificates/views/signatory_editor.js
+++ b/cms/static/js/certificates/views/signatory_editor.js
@@ -129,9 +129,9 @@ function ($, _, Backbone, gettext,
             if (event && event.preventDefault) { event.preventDefault(); }
             var model = this.model;
             var self = this;
-            var titleText = gettext('Delete "<%= signatoryName %>" from the list of signatories?');
+            var titleTextTemplate = _.template(gettext('Delete "<%= signatoryName %>" from the list of signatories?'));
             var confirm = new PromptView.Warning({
-                title: _.template(titleText, {signatoryName: model.get('name')}),
+                title: titleTextTemplate({signatoryName: model.get('name')}),
                 message: gettext('This action cannot be undone.'),
                 actions: {
                     primary: {
diff --git a/cms/static/js/models/settings/course_grader.js b/cms/static/js/models/settings/course_grader.js
index 7f7716eb8b22..f31e832bacca 100644
--- a/cms/static/js/models/settings/course_grader.js
+++ b/cms/static/js/models/settings/course_grader.js
@@ -66,9 +66,10 @@ var CourseGrader = Backbone.Model.extend({
             else attrs.drop_count = intDropCount;
         }
         if (_.has(attrs, 'min_count') && _.has(attrs, 'drop_count') && !_.has(errors, 'min_count') && !_.has(errors, 'drop_count') && attrs.drop_count > attrs.min_count) {
-            errors.drop_count = _.template(
-                gettext("Cannot drop more <% attrs.types %> than will assigned."),
-                attrs, {variable: 'attrs'});
+            var template = _.template(
+                gettext("Cannot drop more <%= types %> assignments than are assigned.")
+            );
+            errors.drop_count = template({types: attrs.type});
         }
         if (!_.isEmpty(errors)) return errors;
     }
diff --git a/cms/static/js/models/uploads.js b/cms/static/js/models/uploads.js
index 7a19b3c4bdde..6eaf020f6079 100644
--- a/cms/static/js/models/uploads.js
+++ b/cms/static/js/models/uploads.js
@@ -15,8 +15,7 @@ var FileUpload = Backbone.Model.extend({
     validate: function(attrs, options) {
         if(attrs.selectedFile && !this.checkTypeValidity(attrs.selectedFile)) {
             return {
-                message: _.template(
-                    gettext("Only <%= fileTypes %> files can be uploaded. Please select a file ending in <%= fileExtensions %> to upload."),
+                message: _.template(gettext("Only <%= fileTypes %> files can be uploaded. Please select a file ending in <%= fileExtensions %> to upload."))( // jshint ignore:line
                     this.formatValidTypes()
                 ),
                 attributes: {selectedFile: true}
@@ -64,7 +63,7 @@ var FileUpload = Backbone.Model.extend({
         }
         var or = gettext('or');
         var formatTypes = function(types) {
-            return _.template('<%= initial %> <%= or %> <%= last %>', {
+            return _.template('<%= initial %> <%= or %> <%= last %>')({
                 initial: _.initial(types).join(', '),
                 or: or,
                 last: _.last(types)
diff --git a/cms/static/js/utils/drag_and_drop.js b/cms/static/js/utils/drag_and_drop.js
index 6228a3201974..1393c870a3ea 100644
--- a/cms/static/js/utils/drag_and_drop.js
+++ b/cms/static/js/utils/drag_and_drop.js
@@ -359,12 +359,12 @@ define(["jquery", "jquery.ui", "underscore", "gettext", "draggabilly",
             makeDraggable: function (element, options) {
                 var draggable;
                 options = _.defaults({
-                    type: null,
-                    handleClass: null,
-                    droppableClass: null,
-                    parentLocationSelector: null,
-                    refresh: null,
-                    ensureChildrenRendered: null
+                    type: undefined,
+                    handleClass: undefined,
+                    droppableClass: undefined,
+                    parentLocationSelector: undefined,
+                    refresh: undefined,
+                    ensureChildrenRendered: undefined
                 }, options);
 
                 if ($(element).data('droppable-class') !== options.droppableClass) {
diff --git a/cms/static/js/views/assets.js b/cms/static/js/views/assets.js
index 0a1c4967eb39..f9694096d3ca 100644
--- a/cms/static/js/views/assets.js
+++ b/cms/static/js/views/assets.js
@@ -67,7 +67,7 @@ define(["jquery", "underscore", "gettext", "js/views/baseview", "js/models/asset
                         ViewUtils.hideLoadingIndicator();
 
                         // Create the table
-                        this.$el.html(_.template(asset_library_template, {typeData: this.typeData}));
+                        this.$el.html(_.template(asset_library_template)({typeData: this.typeData}));
                         tableBody = this.$('#asset-table-body');
                         this.tableBody = tableBody;
                         this.pagingHeader = new PagingHeader({view: this, el: $('#asset-paging-header')});
diff --git a/cms/static/js/views/edit_chapter.js b/cms/static/js/views/edit_chapter.js
index f70839c2d4b2..895e932f3494 100644
--- a/cms/static/js/views/edit_chapter.js
+++ b/cms/static/js/views/edit_chapter.js
@@ -1,3 +1,5 @@
+/*global course */
+
 define(["js/views/baseview", "underscore", "underscore.string", "jquery", "gettext", "js/models/uploads", "js/views/uploads"],
         function(BaseView, _, str, $, gettext, FileUploadModel, UploadDialogView) {
     _.str = str; // used in template
@@ -52,10 +54,8 @@ define(["js/views/baseview", "underscore", "underscore.string", "jquery", "gette
                 asset_path: this.$("input.chapter-asset-path").val()
             });
             var msg = new FileUploadModel({
-                title: _.template(
-                    gettext("Upload a new PDF to “<%= name %>”"),
-                    {name: window.course.escape('name')}
-                ),
+                title: _.template(gettext("Upload a new PDF to “<%= name %>”"))(
+                    {name: course.escape('name')}),
                 message: gettext("Please select a PDF file to upload."),
                 mimeTypes: ['application/pdf']
             });
diff --git a/cms/static/js/views/manage_users_and_roles.js b/cms/static/js/views/manage_users_and_roles.js
index dc2202315859..f9d154696ef5 100644
--- a/cms/static/js/views/manage_users_and_roles.js
+++ b/cms/static/js/views/manage_users_and_roles.js
@@ -54,8 +54,8 @@ define(['jquery', 'underscore', 'gettext', "js/views/baseview",
                 title: messages.alreadyMember.title,
                 message: _.template(
                     messages.alreadyMember.messageTpl,
-                    {email: email, container: containerName},
-                    {interpolate: /\{(.+?)}/g}
+                    {interpolate: /\{(.+?)}/g})(
+                    {email: email, container: containerName}
                 ),
                 actions: {
                     primary: {
@@ -140,7 +140,9 @@ define(['jquery', 'underscore', 'gettext', "js/views/baseview",
                     roles = _.object(_.pluck(this.roles, 'key'), _.pluck(this.roles, "name")),
                     adminRoleCount = this.getAdminRoleCount(),
                     viewHelpers = {
-                        format: function (template, data) { return _.template(template, data, {interpolate: /\{(.+?)}/g}); }
+                        format: function (template, data) {
+                            return _.template(template, {interpolate: /\{(.+?)}/g})(data);
+                        }
                     };
                 for (var i = 0; i < this.users.length; i++) {
                     var user = this.users[i],
@@ -284,8 +286,8 @@ define(['jquery', 'underscore', 'gettext', "js/views/baseview",
                     title: self.messages.deleteUser.title,
                     message: _.template(
                         self.messages.deleteUser.messageTpl,
-                        {email: email, container: self.containerName},
-                        {interpolate: /\{(.+?)}/g}
+                        {interpolate: /\{(.+?)}/g})(
+                        {email: email, container: self.containerName}
                     ),
                     actions: {
                         primary: {
diff --git a/cms/static/js/views/overview.js b/cms/static/js/views/overview.js
deleted file mode 100644
index 12e67280631b..000000000000
--- a/cms/static/js/views/overview.js
+++ /dev/null
@@ -1,242 +0,0 @@
-define(["domReady", "jquery", "jquery.ui", "underscore", "gettext", "common/js/components/views/feedback_notification",
-    "js/utils/cancel_on_escape", "js/utils/date_utils", "js/utils/module", "common/js/components/utils/view_utils"],
-    function (domReady, $, ui, _, gettext, NotificationView, CancelOnEscape,
-              DateUtils, ModuleUtils, ViewUtils) {
-
-        var modalSelector = '.edit-section-publish-settings';
-
-        var toggleSections = function(e) {
-            e.preventDefault();
-
-            var $section = $('.courseware-section');
-            var $button = $(this);
-            var $labelCollapsed = $('<i class="icon fa fa-arrow-up"></i> <span class="label">' +
-                gettext('Collapse All Sections') + '</span>');
-            var $labelExpanded = $('<i class="icon fa fa-arrow-down"></i> <span class="label">' +
-                gettext('Expand All Sections') + '</span>');
-
-            var buttonLabel = $button.hasClass('is-activated') ? $labelCollapsed : $labelExpanded;
-            $button.toggleClass('is-activated').html(buttonLabel);
-
-            if ($button.hasClass('is-activated')) {
-                $section.addClass('collapsed');
-                // first child in order to avoid the icons on the subsection lists which are not in the first child
-                $section.find('header .expand-collapse').removeClass('collapse').addClass('expand');
-            } else {
-                $section.removeClass('collapsed');
-                // first child in order to avoid the icons on the subsection lists which are not in the first child
-                $section.find('header .expand-collapse').removeClass('expand').addClass('collapse');
-            }
-        };
-
-        var toggleSubmodules = function(e) {
-            e.preventDefault();
-            $(this).toggleClass('expand collapse');
-            $(this).closest('.is-collapsible, .window').toggleClass('collapsed');
-        };
-
-
-        var closeModalNew = function (e) {
-            if (e) {
-                e.preventDefault();
-            }
-            $('body').removeClass('modal-window-is-shown');
-            $('.edit-section-publish-settings').removeClass('is-shown');
-        };
-
-        var editSectionPublishDate = function (e) {
-            e.preventDefault();
-            var $modal = $(modalSelector);
-            $modal.attr('data-locator', $(this).attr('data-locator'));
-            $modal.find('.start-date').val($(this).attr('data-date'));
-            $modal.find('.start-time').val($(this).attr('data-time'));
-            if ($modal.find('.start-date').val() == '' && $modal.find('.start-time').val() == '') {
-                $modal.find('.save-button').hide();
-            }
-            $modal.find('.section-name').html('"' + $(this).closest('.courseware-section').find('.section-name-span').text() + '"');
-            $('body').addClass('modal-window-is-shown');
-            $('.edit-section-publish-settings').addClass('is-shown');
-        };
-
-        var saveSetSectionScheduleDate = function (e) {
-            e.preventDefault();
-
-            var datetime = DateUtils.getDate(
-                $('.edit-section-publish-settings .start-date'),
-                $('.edit-section-publish-settings .start-time')
-            );
-
-            var locator = $(modalSelector).attr('data-locator');
-
-            analytics.track('Edited Section Release Date', {
-                'course': course_location_analytics,
-                'id': locator,
-                'start': datetime
-            });
-
-            var saving = new NotificationView.Mini({
-                title: gettext("Saving")
-            });
-            saving.show();
-            // call into server to commit the new order
-            $.ajax({
-                url: ModuleUtils.getUpdateUrl(locator),
-                type: "PUT",
-                dataType: "json",
-                contentType: "application/json",
-                data: JSON.stringify({
-                    'metadata': {
-                        'start': datetime
-                    }
-                })
-            }).success(function() {
-                    var pad2 = function(number) {
-                        // pad a number to two places: useful for formatting months, days, hours, etc
-                        // when displaying a date/time
-                        return (number < 10 ? '0' : '') + number;
-                    };
-
-                    var $thisSection = $('.courseware-section[data-locator="' + locator + '"]');
-                    var html = _.template(
-                        '<span class="published-status">' +
-                            '<strong>' + gettext("Release date:") + '&nbsp;</strong>' +
-                            gettext("{month}/{day}/{year} at {hour}:{minute} UTC") +
-                            '</span>' +
-                            '<a href="#" class="edit-release-date action" data-date="{month}/{day}/{year}" data-time="{hour}:{minute}" data-locator="{locator}"><i class="icon fa fa-time"></i> <span class="sr">' +
-                            gettext("Edit section release date") +
-                            '</span></a>',
-                        {year: datetime.getUTCFullYear(), month: pad2(datetime.getUTCMonth() + 1), day: pad2(datetime.getUTCDate()),
-                            hour: pad2(datetime.getUTCHours()), minute: pad2(datetime.getUTCMinutes()),
-                            locator: locator},
-                        {interpolate: /\{(.+?)\}/g});
-                    $thisSection.find('.section-published-date').html(html);
-                    saving.hide();
-                    closeModalNew();
-                });
-        };
-
-        var addNewSection = function (e) {
-            e.preventDefault();
-
-            $(e.target).addClass('disabled');
-
-            var $newSection = $($('#new-section-template').html());
-            var $cancelButton = $newSection.find('.new-section-name-cancel');
-            $('.courseware-overview').prepend($newSection);
-            $newSection.find('.new-section-name').focus().select();
-            $newSection.find('.section-name-form').bind('submit', saveNewSection);
-            $cancelButton.bind('click', cancelNewSection);
-            CancelOnEscape($cancelButton);
-        };
-
-        var saveNewSection = function (e) {
-            e.preventDefault();
-
-            var $saveButton = $(this).find('.new-section-name-save');
-            var parent = $saveButton.data('parent');
-            var category = $saveButton.data('category');
-            var display_name = $(this).find('.new-section-name').val();
-
-            analytics.track('Created a Section', {
-                'course': course_location_analytics,
-                'display_name': display_name
-            });
-
-            $.postJSON(ModuleUtils.getUpdateUrl(), {
-                    'parent_locator': parent,
-                    'category': category,
-                    'display_name': display_name
-                },
-
-                function(data) {
-                    if (data.locator != undefined) location.reload();
-                });
-        };
-
-        var cancelNewSection = function (e) {
-            e.preventDefault();
-            $('.new-courseware-section-button').removeClass('disabled');
-            $(this).parents('section.new-section').remove();
-        };
-
-        var addNewSubsection = function (e) {
-            e.preventDefault();
-            var $section = $(this).closest('.courseware-section');
-            var $newSubsection = $($('#new-subsection-template').html());
-            $section.find('.subsection-list > ol').append($newSubsection);
-            $section.find('.new-subsection-name-input').focus().select();
-
-            var $saveButton = $newSubsection.find('.new-subsection-name-save');
-            var $cancelButton = $newSubsection.find('.new-subsection-name-cancel');
-
-            var parent = $(this).parents("section.courseware-section").data("locator");
-
-            $saveButton.data('parent', parent);
-            $saveButton.data('category', $(this).data('category'));
-
-            $newSubsection.find('.new-subsection-form').bind('submit', saveNewSubsection);
-            $cancelButton.bind('click', cancelNewSubsection);
-            CancelOnEscape($cancelButton);
-        };
-
-        var saveNewSubsection = function (e) {
-            e.preventDefault();
-
-            var parent = $(this).find('.new-subsection-name-save').data('parent');
-            var category = $(this).find('.new-subsection-name-save').data('category');
-            var display_name = $(this).find('.new-subsection-name-input').val();
-
-            analytics.track('Created a Subsection', {
-                'course': course_location_analytics,
-                'display_name': display_name
-            });
-
-
-            $.postJSON(ModuleUtils.getUpdateUrl(), {
-                    'parent_locator': parent,
-                    'category': category,
-                    'display_name': display_name
-                },
-
-                function(data) {
-                    if (data.locator != undefined) {
-                        location.reload();
-                    }
-                });
-        };
-
-        var cancelNewSubsection = function (e) {
-            e.preventDefault();
-            $(this).parents('li.courseware-subsection').remove();
-        };
-
-
-
-        domReady(function() {
-            // toggling overview section details
-            $(function() {
-                if ($('.courseware-section').length > 0) {
-                    $('.toggle-button-sections').addClass('is-shown');
-                }
-            });
-            $('.toggle-button-sections').bind('click', toggleSections);
-            $('.expand-collapse').bind('click', toggleSubmodules);
-
-            $('.dismiss-button').bind('click', ViewUtils.deleteNotificationHandler(function () {
-                $('.wrapper-alert-announcement').remove();
-            }));
-
-            var $body = $('body');
-            $body.on('click', '.section-published-date .edit-release-date', editSectionPublishDate);
-            $body.on('click', '.edit-section-publish-settings .action-save', saveSetSectionScheduleDate);
-            $body.on('click', '.edit-section-publish-settings .action-cancel', closeModalNew);
-
-            $('.new-courseware-section-button').bind('click', addNewSection);
-            $('.new-subsection-item').bind('click', addNewSubsection);
-
-        });
-
-        return {
-            saveSetSectionScheduleDate: saveSetSectionScheduleDate
-        };
-    });
diff --git a/cms/static/js/views/paging_header.js b/cms/static/js/views/paging_header.js
index 25c23acf4854..662faf2139c2 100644
--- a/cms/static/js/views/paging_header.js
+++ b/cms/static/js/views/paging_header.js
@@ -22,9 +22,7 @@ define(["underscore", "backbone", "gettext", "text!templates/paging-header.under
                     currentPage = collection.currentPage,
                     lastPage = collection.totalPages - 1,
                     messageHtml = this.messageHtml();
-                this.$el.html(_.template(paging_header_template, {
-                    messageHtml: messageHtml
-                }));
+                this.$el.html(_.template(paging_header_template)({ messageHtml: messageHtml}));
                 this.$(".previous-page-link").toggleClass("is-disabled", currentPage === 0).attr('aria-disabled', currentPage === 0);
                 this.$(".next-page-link").toggleClass("is-disabled", currentPage === lastPage).attr('aria-disabled', currentPage === lastPage);
                 return this;
diff --git a/cms/static/js/views/show_textbook.js b/cms/static/js/views/show_textbook.js
index 2dcc47015469..9f0ecd316a8c 100644
--- a/cms/static/js/views/show_textbook.js
+++ b/cms/static/js/views/show_textbook.js
@@ -27,10 +27,9 @@ define(["js/views/baseview", "underscore", "gettext", "common/js/components/view
         },
         confirmDelete: function(e) {
             if(e && e.preventDefault) { e.preventDefault(); }
-            var textbook = this.model, collection = this.model.collection;
-            var msg = new PromptView.Warning({
-                title: _.template(
-                    gettext("Delete “<%= name %>”?"),
+            var textbook = this.model;
+            new PromptView.Warning({
+                title: _.template(gettext("Delete “<%= name %>”?"))(
                     {name: textbook.get('name')}
                 ),
                 message: gettext("Deleting a textbook cannot be undone and once deleted any reference to it in your courseware's navigation will also be removed."),
diff --git a/cms/static/js/views/video/transcripts/file_uploader.js b/cms/static/js/views/video/transcripts/file_uploader.js
index 77e967ce926a..41f69dd3b75e 100644
--- a/cms/static/js/views/video/transcripts/file_uploader.js
+++ b/cms/static/js/views/video/transcripts/file_uploader.js
@@ -18,7 +18,9 @@ function($, Backbone, _, Utils) {
         uploadTpl: '#file-upload',
 
         initialize: function () {
-            _.bindAll(this);
+            _.bindAll(this,
+                'changeHandler', 'clickHandler', 'xhrResetProgressBar', 'xhrProgressHandler', 'xhrCompleteHandler'
+            );
 
             this.file = false;
             this.render();
diff --git a/cms/static/js/views/video/transcripts/message_manager.js b/cms/static/js/views/video/transcripts/message_manager.js
index ef15c9d3048d..d405b713e223 100644
--- a/cms/static/js/views/video/transcripts/message_manager.js
+++ b/cms/static/js/views/video/transcripts/message_manager.js
@@ -29,7 +29,9 @@ function($, Backbone, _, Utils, FileUploader, gettext) {
         },
 
         initialize: function () {
-            _.bindAll(this);
+            _.bindAll(this,
+                'importHandler', 'replaceHandler', 'chooseHandler', 'useExistingHandler', 'showError', 'hideError'
+            );
 
             this.component_locator = this.$el.closest('[data-locator]').data('locator');
 
diff --git a/cms/templates/js/validation-error-modal.underscore b/cms/templates/js/validation-error-modal.underscore
index 5d82d7cd0616..0347b8a06f1c 100644
--- a/cms/templates/js/validation-error-modal.underscore
+++ b/cms/templates/js/validation-error-modal.underscore
@@ -2,17 +2,17 @@
     <div class "error-header">
         <p>
         <%= _.template(
-        ngettext(
-            "There was {strong_start}{num_errors} validation error{strong_end} while trying to save the course settings in the database.",
-            "There were {strong_start}{num_errors} validation errors{strong_end} while trying to save the course settings in the database.",
-            num_errors
-        ),
-        {
-            strong_start:'<strong>',
-            num_errors: num_errors,
-            strong_end: '</strong>'
-        },
-        {interpolate: /\{(.+?)\}/g})%>
+            ngettext(
+                "There was {strong_start}{num_errors} validation error{strong_end} while trying to save the course settings in the database.",
+                "There were {strong_start}{num_errors} validation errors{strong_end} while trying to save the course settings in the database.",
+                num_errors
+            ),
+            {interpolate: /\{(.+?)\}/g})(
+            {
+                strong_start:'<strong>',
+                num_errors: num_errors,
+                strong_end: '</strong>'
+            })%>
         <%= gettext("Please check the following validation feedbacks and reflect them in your course settings:")%></p>
     </div>
 
diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_player_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_player_spec.js
index 922908b74354..a8f8fd789b06 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_player_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_player_spec.js
@@ -361,9 +361,14 @@ function (VideoPlayer) {
 
         describe('onSeek', function () {
             beforeEach(function () {
+                // jasmine.Clock can't be used to fake out debounce with newer versions of underscore
+                spyOn(_, 'debounce').andCallFake(function (func) {
+                    return function () {
+                        func.apply(this, arguments);
+                    };
+                });
                 state = jasmine.initializePlayer();
                 state.videoEl = $('video, iframe');
-                jasmine.Clock.useMock();
                 spyOn(state.videoPlayer, 'duration').andReturn(120);
             });
 
@@ -384,9 +389,6 @@ function (VideoPlayer) {
                         spyOn(state.videoPlayer, 'stopTimer');
                         spyOn(state.videoPlayer, 'runTimer');
                         state.videoPlayer.seekTo(10);
-                        // Video player uses _.debounce (with a wait time in 300 ms) for seeking.
-                        // That's why we have to do this tick(300).
-                        jasmine.Clock.tick(300);
                         expect(state.videoPlayer.currentTime).toBe(10);
                         expect(state.videoPlayer.stopTimer).toHaveBeenCalled();
                         expect(state.videoPlayer.runTimer).toHaveBeenCalled();
@@ -399,9 +401,6 @@ function (VideoPlayer) {
                         state.videoProgressSlider.onSlide(
                             jQuery.Event('slide'), { value: 30 }
                         );
-                        // Video player uses _.debounce (with a wait time in 300 ms) for seeking.
-                        // That's why we have to do this tick(300).
-                        jasmine.Clock.tick(300);
                         expect(state.videoPlayer.currentTime).toBe(30);
                         expect(state.videoPlayer.player.seekTo).toHaveBeenCalledWith(30, true);
                     });
@@ -413,9 +412,6 @@ function (VideoPlayer) {
                         state.videoProgressSlider.onSlide(
                             jQuery.Event('slide'), { value: 30 }
                         );
-                        // Video player uses _.debounce (with a wait time in 300 ms) for seeking.
-                        // That's why we have to do this tick(300).
-                        jasmine.Clock.tick(300);
                         expect(state.videoPlayer.currentTime).toBe(30);
                         expect(state.videoPlayer.updatePlayTime).toHaveBeenCalledWith(30, true);
                     });
@@ -426,17 +422,11 @@ function (VideoPlayer) {
                 state.videoProgressSlider.onSlide(
                     jQuery.Event('slide'), { value: 20 }
                 );
-                // Video player uses _.debounce (with a wait time in 300 ms) for seeking.
-                // That's why we have to do this tick(300).
-                jasmine.Clock.tick(300);
                 state.videoPlayer.pause();
                 expect(state.videoPlayer.currentTime).toBe(20);
                 state.videoProgressSlider.onSlide(
                     jQuery.Event('slide'), { value: 10 }
                 );
-                // Video player uses _.debounce (with a wait time in 300 ms) for seeking.
-                // That's why we have to do this tick(300).
-                jasmine.Clock.tick(300);
                 expect(state.videoPlayer.currentTime).toBe(10);
             });
 
diff --git a/common/lib/xmodule/xmodule/js/src/html/imageModal.js b/common/lib/xmodule/xmodule/js/src/html/imageModal.js
index d357ee5763fb..5577c57410dc 100644
--- a/common/lib/xmodule/xmodule/js/src/html/imageModal.js
+++ b/common/lib/xmodule/xmodule/js/src/html/imageModal.js
@@ -13,7 +13,7 @@ var setupFullScreenModal = function() {
         "largeALT": smallImageObject.attr('alt'),
         "largeSRC": largeImageSRC
       };
-      var html = _.template($("#image-modal-tpl").text(), data);
+      var html = _.template($("#image-modal-tpl").text())(data);
       $(this).replaceWith(html);
     }
   });
diff --git a/common/static/coffee/spec/discussion/view/thread_response_show_view_spec.coffee b/common/static/coffee/spec/discussion/view/thread_response_show_view_spec.coffee
index 41f9511e7ec4..b68c9538da92 100644
--- a/common/static/coffee/spec/discussion/view/thread_response_show_view_spec.coffee
+++ b/common/static/coffee/spec/discussion/view/thread_response_show_view_spec.coffee
@@ -115,7 +115,7 @@ describe "ThreadResponseShowView", ->
         expect(@view.$(".posted-details").text()).not.toMatch("marked as answer")
 
     it "allows a moderator to mark an answer in a question thread", ->
-        DiscussionUtil.loadRoles({"Moderator": parseInt(window.user.id)})
+        DiscussionUtil.loadRoles({"Moderator": [parseInt(window.user.id)]})
         @thread.set({
             "thread_type": "question",
             "user_id": (parseInt(window.user.id) + 1).toString()
diff --git a/common/static/coffee/src/discussion/discussion_filter.coffee b/common/static/coffee/src/discussion/discussion_filter.coffee
deleted file mode 100644
index f9cc710e0ddb..000000000000
--- a/common/static/coffee/src/discussion/discussion_filter.coffee
+++ /dev/null
@@ -1,28 +0,0 @@
-class @DiscussionFilter
-
-  # TODO: this helper class duplicates functionality in DiscussionThreadListView.filterTopics
-  # for use with a very similar category dropdown in the New Post form.  The two menus' implementations
-  # should be merged into a single reusable view.
-
-  @filterDrop: (e) ->
-    $drop = $(e.target).parents('.topic-menu-wrapper')
-    query = $(e.target).val()
-    $items = $drop.find('.topic-menu-item')
-
-    if(query.length == 0)
-      $items.removeClass('hidden')
-      return;
-
-    $items.addClass('hidden')
-    $items.each (i) ->
-
-      path = $(this).parents(".topic-menu-item").andSelf()
-      pathTitles = path.children(".topic-title").map((i, elem) -> $(elem).text()).get()
-      pathText = pathTitles.join(" / ").toLowerCase()
-
-      if query.split(" ").every((term) -> pathText.search(term.toLowerCase()) != -1)
-        $(this).removeClass('hidden')
-        # show children
-        $(this).find('.topic-menu-item').removeClass('hidden');
-        # show parents
-        $(this).parents('.topic-menu-item').removeClass('hidden');
diff --git a/common/static/coffee/src/discussion/views/discussion_thread_edit_view.js b/common/static/coffee/src/discussion/views/discussion_thread_edit_view.js
index 21e71e79f674..8f954c5668a2 100644
--- a/common/static/coffee/src/discussion/views/discussion_thread_edit_view.js
+++ b/common/static/coffee/src/discussion/views/discussion_thread_edit_view.js
@@ -19,7 +19,7 @@
                 this.threadType = this.model.get('thread_type');
                 this.topicId = this.model.get('commentable_id');
                 this.context = options.context || 'course';
-                _.bindAll(this);
+                _.bindAll(this, 'updateHandler', 'cancelHandler');
                 return this;
             },
 
diff --git a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
index a01ef013d2e7..512df6340501 100644
--- a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
@@ -39,9 +39,9 @@ if Backbone?
 
       @searchAlertCollection.on "add", (searchAlert) =>
         content = _.template(
-          $("#search-alert-template").html(),
+          $("#search-alert-template").html())(
           {'message': searchAlert.attributes.message, 'cid': searchAlert.cid}
-          )
+        )
         @$(".search-alerts").append(content)
         @$("#search-alert-" + searchAlert.cid + " a.dismiss").bind "click", searchAlert, (event) =>
           @removeSearchAlert(event.data.cid)
@@ -491,7 +491,7 @@ if Backbone?
             message = interpolate(
               _.escape(gettext('Show posts by %(username)s.')),
               {"username":
-                _.template('<a class="link-jump" href="<%= url %>"><%- username %></a>', {
+                _.template('<a class="link-jump" href="<%= url %>"><%- username %></a>')({
                   url: DiscussionUtil.urlFor("user_profile", response.users[0].id),
                   username: response.users[0].username
                 })
diff --git a/common/static/coffee/src/discussion/views/discussion_topic_menu_view.js b/common/static/coffee/src/discussion/views/discussion_topic_menu_view.js
index c205a7535ed9..b7350fb0f766 100644
--- a/common/static/coffee/src/discussion/views/discussion_topic_menu_view.js
+++ b/common/static/coffee/src/discussion/views/discussion_topic_menu_view.js
@@ -6,7 +6,7 @@
                 'click .post-topic-button': 'toggleTopicDropdown',
                 'click .topic-menu-wrapper': 'handleTopicEvent',
                 'click .topic-filter-label': 'ignoreClick',
-                'keyup .topic-filter-input': this.DiscussionFilter.filterDrop
+                'keyup .topic-filter-input': 'filterDrop'
             },
 
             attributes: {
@@ -17,7 +17,9 @@
                 this.course_settings = options.course_settings;
                 this.currentTopicId = options.topicId;
                 this.maxNameWidth = 100;
-                _.bindAll(this);
+                _.bindAll(this,
+                    'toggleTopicDropdown', 'handleTopicEvent', 'hideTopicDropdown', 'ignoreClick'
+                );
                 return this;
             },
 
@@ -34,7 +36,7 @@
             render: function() {
                 var context = _.clone(this.course_settings.attributes);
                 context.topics_html = this.renderCategoryMap(this.course_settings.get('category_map'));
-                this.$el.html(_.template($('#topic-template').html(), context));
+                this.$el.html(_.template($('#topic-template').html())(context));
                 this.dropdownButton = this.$('.post-topic-button');
                 this.topicMenu = this.$('.topic-menu-wrapper');
                 this.selectedTopic = this.$('.js-selected-topic');
@@ -187,6 +189,38 @@
                     }
                 }
                 return name;
+            },
+
+            // TODO: this helper class duplicates functionality in DiscussionThreadListView.filterTopics
+            // for use with a very similar category dropdown in the New Post form.  The two menus' implementations
+            // should be merged into a single reusable view.
+            filterDrop: function (e) {
+                var $drop, $items, query;
+                $drop = $(e.target).parents('.topic-menu-wrapper');
+                query = $(e.target).val();
+                $items = $drop.find('.topic-menu-item');
+
+                if (query.length === 0) {
+                    $items.removeClass('hidden');
+                    return;
+                }
+
+                $items.addClass('hidden');
+                $items.each(function (_index, item) {
+                    var path, pathText, pathTitles;
+                    path = $(item).parents(".topic-menu-item").andSelf();
+                    pathTitles = path.children(".topic-title").map(function (_, elem) {
+                        return $(elem).text();
+                    }).get();
+                    pathText = pathTitles.join(" / ").toLowerCase();
+                    if (query.split(" ").every(function (term) {
+                            return pathText.search(term.toLowerCase()) !== -1;
+                        })) {
+                        $(item).removeClass('hidden');
+                        $(item).find('.topic-menu-item').removeClass('hidden');
+                        $(item).parents('.topic-menu-item').removeClass('hidden');
+                    }
+                });
             }
         });
     }
diff --git a/common/static/coffee/src/discussion/views/new_post_view.coffee b/common/static/coffee/src/discussion/views/new_post_view.coffee
index 75ad7a91bc8c..375ec2761823 100644
--- a/common/static/coffee/src/discussion/views/new_post_view.coffee
+++ b/common/static/coffee/src/discussion/views/new_post_view.coffee
@@ -17,7 +17,7 @@ if Backbone?
               mode: @mode,
               form_id: @mode + (if @topicId then "-" + @topicId else "")
           })
-          @$el.html(_.template($("#new-post-template").html(), context))
+          @$el.html(_.template($("#new-post-template").html())(context))
           threadTypeTemplate = _.template($("#thread-type-template").html());
           if $('.js-group-select').is(':disabled')
               $('.group-selector-wrapper').addClass('disabled')
diff --git a/common/static/common/js/components/collections/paging_collection.js b/common/static/common/js/components/collections/paging_collection.js
index a8af9098977c..0259b56c2c34 100644
--- a/common/static/common/js/components/collections/paging_collection.js
+++ b/common/static/common/js/components/collections/paging_collection.js
@@ -79,6 +79,9 @@
              * underlying server API.
              */
             getPage: function () {
+                // TODO: this.currentPage is currently returning a function sometimes when it is called.
+                // It is possible it always did this, but we either need to investigate more, or just wait until
+                // we replace this code with the pattern library.
                 return this.currentPage + (this.isZeroIndexed ? 1 : 0);
             },
 
diff --git a/common/static/common/js/components/utils/view_utils.js b/common/static/common/js/components/utils/view_utils.js
index 60226adaae9e..22f072f99e4a 100644
--- a/common/static/common/js/components/utils/view_utils.js
+++ b/common/static/common/js/components/utils/view_utils.js
@@ -244,7 +244,7 @@
                 if (!validateTotalKeyLength(key_field_selectors)) {
                     $(selectors.errorWrapper).addClass(classes.shown).removeClass(classes.hiding);
                     $(selectors.errorMessage).html(
-                        '<p>' + _.template(message_tpl, {limit: MAX_SUM_KEY_LENGTH}) + '</p>'
+                        '<p>' + _.template(message_tpl)({limit: MAX_SUM_KEY_LENGTH}) + '</p>'
                     );
                     $(selectors.save).addClass(classes.disabled);
                 } else {
diff --git a/common/static/common/js/components/views/feedback_alert.js b/common/static/common/js/components/views/feedback_alert.js
index 8f3f716a58cc..1b21974ce11f 100644
--- a/common/static/common/js/components/views/feedback_alert.js
+++ b/common/static/common/js/components/views/feedback_alert.js
@@ -2,7 +2,7 @@
     'use strict';
     define(["jquery", "underscore", "underscore.string", "common/js/components/views/feedback"],
         function($, _, str, SystemFeedbackView) {
-            str = str || _.str;
+
         var Alert = SystemFeedbackView.extend({
             options: $.extend({}, SystemFeedbackView.prototype.options, {
                 type: "alert"
diff --git a/common/static/common/js/components/views/feedback_notification.js b/common/static/common/js/components/views/feedback_notification.js
index 2fb74f691d14..34910cb59efc 100644
--- a/common/static/common/js/components/views/feedback_notification.js
+++ b/common/static/common/js/components/views/feedback_notification.js
@@ -2,7 +2,7 @@
     'use strict';
     define(["jquery", "underscore", "underscore.string", "common/js/components/views/feedback"],
         function($, _, str, SystemFeedbackView) {
-            str = str || _.str;
+
         var Notification = SystemFeedbackView.extend({
             options: $.extend({}, SystemFeedbackView.prototype.options, {
                 type: "notification",
diff --git a/common/static/common/js/components/views/feedback_prompt.js b/common/static/common/js/components/views/feedback_prompt.js
index 31c1e9b4ad97..be69d3001e84 100644
--- a/common/static/common/js/components/views/feedback_prompt.js
+++ b/common/static/common/js/components/views/feedback_prompt.js
@@ -2,7 +2,7 @@
     'use strict';
     define(["jquery", "underscore", "underscore.string", "common/js/components/views/feedback"],
         function($, _, str, SystemFeedbackView) {
-            str = str || _.str;
+
             var Prompt = SystemFeedbackView.extend({
                 options: $.extend({}, SystemFeedbackView.prototype.options, {
                     type: "prompt",
diff --git a/common/static/common/js/components/views/paginated_view.js b/common/static/common/js/components/views/paginated_view.js
index 0507d52cbdce..7755a93f1d31 100644
--- a/common/static/common/js/components/views/paginated_view.js
+++ b/common/static/common/js/components/views/paginated_view.js
@@ -50,7 +50,7 @@
             },
 
             render: function () {
-                this.$el.html(_.template(paginatedViewTemplate, {type: this.type}));
+                this.$el.html(_.template(paginatedViewTemplate)({type: this.type}));
                 this.assign(this.listView, '.' + this.type + '-list');
                 if (this.headerView) {
                     this.assign(this.headerView, '.' + this.type + '-paging-header');
diff --git a/common/static/common/js/components/views/paging_footer.js b/common/static/common/js/components/views/paging_footer.js
index 36d2c74f2a52..8b796b52b9ec 100644
--- a/common/static/common/js/components/views/paging_footer.js
+++ b/common/static/common/js/components/views/paging_footer.js
@@ -30,7 +30,7 @@
                             this.$el.removeClass('hidden');
                         }
                     }
-                    this.$el.html(_.template(paging_footer_template, {
+                    this.$el.html(_.template(paging_footer_template)({
                         current_page: this.collection.getPage(),
                         total_pages: this.collection.totalPages
                     }));
diff --git a/common/static/common/js/components/views/paging_header.js b/common/static/common/js/components/views/paging_header.js
index c49af8bc4bc7..b7e8abe531ea 100644
--- a/common/static/common/js/components/views/paging_header.js
+++ b/common/static/common/js/components/views/paging_header.js
@@ -33,7 +33,7 @@
                         context, true
                     );
                 }
-                this.$el.html(_.template(headerTemplate, {
+                this.$el.html(_.template(headerTemplate)({
                     message: message,
                     srInfo: this.srInfo,
                     sortableFields: this.collection.sortableFields,
diff --git a/common/static/common/js/components/views/search_field.js b/common/static/common/js/components/views/search_field.js
index 955133fe1c54..9cd1a7ca9067 100644
--- a/common/static/common/js/components/views/search_field.js
+++ b/common/static/common/js/components/views/search_field.js
@@ -37,7 +37,7 @@
                 },
 
                 render: function() {
-                    this.$el.html(_.template(searchFieldTemplate, {
+                    this.$el.html(_.template(searchFieldTemplate)({
                         type: this.type,
                         searchString: this.collection.searchString,
                         searchLabel: this.label
diff --git a/common/static/common/js/utils/edx.utils.validate.js b/common/static/common/js/utils/edx.utils.validate.js
index 4d82f9ff7a3d..4afb247ba1b9 100644
--- a/common/static/common/js/utils/edx.utils.validate.js
+++ b/common/static/common/js/utils/edx.utils.validate.js
@@ -15,9 +15,6 @@
          * by the access view, but doing it here helps keep the
          * utility self-contained.
          */
-        if (_.isUndefined(_s)) {
-            _s = _.str;
-        }
         _.mixin( _s.exports() );
 
         utils = (function(){
diff --git a/common/static/common/templates/discussion/forum-actions.underscore b/common/static/common/templates/discussion/forum-actions.underscore
index 5401e4118099..ac637a0bca93 100644
--- a/common/static/common/templates/discussion/forum-actions.underscore
+++ b/common/static/common/templates/discussion/forum-actions.underscore
@@ -1,6 +1,6 @@
 <% if (!readOnly) { %>
     <ul class="<%= contentType %>-actions-list">
-        <% _.each(primaryActions, function(action) { print(_.template($('#forum-action-' + action).html(), {})) }) %>
+        <% _.each(primaryActions, function(action) { print(_.template($('#forum-action-' + action).html())({})) }) %>
         <li class="actions-item is-visible">
             <div class="more-wrapper">
                 <a href="javascript:void(0)" class="action-button action-more" role="button" aria-haspopup="true" aria-controls="action-menu-<%= contentId %>">
@@ -9,7 +9,7 @@
                 </a>
                 <div class="actions-dropdown" id="action-menu-<%= contentType %>" aria-expanded="false">
                   <ul class="actions-dropdown-list">
-                    <% _.each(secondaryActions, function(action) { print(_.template($('#forum-action-' + action).html(), {})) }) %>
+                    <% _.each(secondaryActions, function(action) { print(_.template($('#forum-action-' + action).html())({})) }) %>
                   </ul>
                 </div>
             </div>
diff --git a/common/static/common/templates/discussion/response-comment-show.underscore b/common/static/common/templates/discussion/response-comment-show.underscore
index 9733a0d0c41e..1f3f7c547506 100644
--- a/common/static/common/templates/discussion/response-comment-show.underscore
+++ b/common/static/common/templates/discussion/response-comment-show.underscore
@@ -2,7 +2,7 @@
   <div class="response-body"><%- body %></div>
   <%=
       _.template(
-          $('#forum-actions').html(),
+          $('#forum-actions').html())(
           {
               contentId: cid,
               contentType: 'comment',
diff --git a/common/static/common/templates/discussion/thread-response-show.underscore b/common/static/common/templates/discussion/thread-response-show.underscore
index ffb19a4fa75c..502cc4ee1b98 100644
--- a/common/static/common/templates/discussion/thread-response-show.underscore
+++ b/common/static/common/templates/discussion/thread-response-show.underscore
@@ -44,7 +44,7 @@
       <div class="response-header-actions">
         <%=
             _.template(
-                $('#forum-actions').html(),
+                $('#forum-actions').html())(
                 {
                     contentId: cid,
                     contentType: 'response',
diff --git a/common/static/common/templates/discussion/thread-show.underscore b/common/static/common/templates/discussion/thread-show.underscore
index 35b3996938a7..cd260bc2e810 100644
--- a/common/static/common/templates/discussion/thread-show.underscore
+++ b/common/static/common/templates/discussion/thread-show.underscore
@@ -30,7 +30,7 @@
             <div class="post-header-actions post-extended-content">
                 <%=
                 _.template(
-                    $('#forum-actions').html(),
+                    $('#forum-actions').html())(
                     {
                         contentId: cid,
                         contentType: 'post',
diff --git a/common/static/js/src/string_utils.js b/common/static/js/src/string_utils.js
index dc48dcb01ddb..550ec62dfcbd 100644
--- a/common/static/js/src/string_utils.js
+++ b/common/static/js/src/string_utils.js
@@ -21,7 +21,7 @@
      */
     var interpolate_ntext = function (singular, plural, count, values) {
         var text = count === 1 ? singular : plural;
-        return _.template(text, values, {interpolate: /\{(.+?)\}/g});
+        return _.template(text, {interpolate: /\{(.+?)\}/g})(values);
     };
     this.interpolate_ntext = interpolate_ntext;
 
@@ -42,7 +42,7 @@
      * @returns the text with placeholder values filled in
      */
     var interpolate_text = function (text, values) {
-        return _.template(text, values, {interpolate: /\{(.+?)\}/g});
+        return _.template(text, {interpolate: /\{(.+?)\}/g})(values);
     };
     this.interpolate_text = interpolate_text;
 }).call(this, _);
diff --git a/common/static/js/src/tooltip_manager.js b/common/static/js/src/tooltip_manager.js
index 83eba8cad30e..425946a43552 100644
--- a/common/static/js/src/tooltip_manager.js
+++ b/common/static/js/src/tooltip_manager.js
@@ -12,7 +12,7 @@
         }
 
         this.hide();
-        _.bindAll(this);
+        _.bindAll(this, 'show', 'hide', 'showTooltip', 'moveTooltip', 'hideTooltip', 'click');
         this.bindEvents();
     };
 
diff --git a/common/static/js/vendor/underscore.string.min.js b/common/static/js/vendor/underscore.string.min.js
deleted file mode 100644
index 659ddbed2a99..000000000000
--- a/common/static/js/vendor/underscore.string.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e,t){"use strict";var n=t.prototype.trim,r=t.prototype.trimRight,i=t.prototype.trimLeft,s=function(e){return e*1||0},o=function(e,t){if(t<1)return"";var n="";while(t>0)t&1&&(n+=e),t>>=1,e+=e;return n},u=[].slice,a=function(e){return e==null?"\\s":e.source?e.source:"["+p.escapeRegExp(e)+"]"},f={lt:"<",gt:">",quot:'"',apos:"'",amp:"&"},l={};for(var c in f)l[f[c]]=c;var h=function(){function e(e){return Object.prototype.toString.call(e).slice(8,-1).toLowerCase()}var n=o,r=function(){return r.cache.hasOwnProperty(arguments[0])||(r.cache[arguments[0]]=r.parse(arguments[0])),r.format.call(null,r.cache[arguments[0]],arguments)};return r.format=function(r,i){var s=1,o=r.length,u="",a,f=[],l,c,p,d,v,m;for(l=0;l<o;l++){u=e(r[l]);if(u==="string")f.push(r[l]);else if(u==="array"){p=r[l];if(p[2]){a=i[s];for(c=0;c<p[2].length;c++){if(!a.hasOwnProperty(p[2][c]))throw new Error(h('[_.sprintf] property "%s" does not exist',p[2][c]));a=a[p[2][c]]}}else p[1]?a=i[p[1]]:a=i[s++];if(/[^s]/.test(p[8])&&e(a)!="number")throw new Error(h("[_.sprintf] expecting number but found %s",e(a)));switch(p[8]){case"b":a=a.toString(2);break;case"c":a=t.fromCharCode(a);break;case"d":a=parseInt(a,10);break;case"e":a=p[7]?a.toExponential(p[7]):a.toExponential();break;case"f":a=p[7]?parseFloat(a).toFixed(p[7]):parseFloat(a);break;case"o":a=a.toString(8);break;case"s":a=(a=t(a))&&p[7]?a.substring(0,p[7]):a;break;case"u":a=Math.abs(a);break;case"x":a=a.toString(16);break;case"X":a=a.toString(16).toUpperCase()}a=/[def]/.test(p[8])&&p[3]&&a>=0?"+"+a:a,v=p[4]?p[4]=="0"?"0":p[4].charAt(1):" ",m=p[6]-t(a).length,d=p[6]?n(v,m):"",f.push(p[5]?a+d:d+a)}}return f.join("")},r.cache={},r.parse=function(e){var t=e,n=[],r=[],i=0;while(t){if((n=/^[^\x25]+/.exec(t))!==null)r.push(n[0]);else if((n=/^\x25{2}/.exec(t))!==null)r.push("%");else{if((n=/^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fosuxX])/.exec(t))===null)throw new Error("[_.sprintf] huh?");if(n[2]){i|=1;var s=[],o=n[2],u=[];if((u=/^([a-z_][a-z_\d]*)/i.exec(o))===null)throw new Error("[_.sprintf] huh?");s.push(u[1]);while((o=o.substring(u[0].length))!=="")if((u=/^\.([a-z_][a-z_\d]*)/i.exec(o))!==null)s.push(u[1]);else{if((u=/^\[(\d+)\]/.exec(o))===null)throw new Error("[_.sprintf] huh?");s.push(u[1])}n[2]=s}else i|=2;if(i===3)throw new Error("[_.sprintf] mixing positional and named placeholders is not (yet) supported");r.push(n)}t=t.substring(n[0].length)}return r},r}(),p={VERSION:"2.3.0",isBlank:function(e){return e==null&&(e=""),/^\s*$/.test(e)},stripTags:function(e){return e==null?"":t(e).replace(/<\/?[^>]+>/g,"")},capitalize:function(e){return e=e==null?"":t(e),e.charAt(0).toUpperCase()+e.slice(1)},chop:function(e,n){return e==null?[]:(e=t(e),n=~~n,n>0?e.match(new RegExp(".{1,"+n+"}","g")):[e])},clean:function(e){return p.strip(e).replace(/\s+/g," ")},count:function(e,n){return e==null||n==null?0:t(e).split(n).length-1},chars:function(e){return e==null?[]:t(e).split("")},swapCase:function(e){return e==null?"":t(e).replace(/\S/g,function(e){return e===e.toUpperCase()?e.toLowerCase():e.toUpperCase()})},escapeHTML:function(e){return e==null?"":t(e).replace(/[&<>"']/g,function(e){return"&"+l[e]+";"})},unescapeHTML:function(e){return e==null?"":t(e).replace(/\&([^;]+);/g,function(e,n){var r;return n in f?f[n]:(r=n.match(/^#x([\da-fA-F]+)$/))?t.fromCharCode(parseInt(r[1],16)):(r=n.match(/^#(\d+)$/))?t.fromCharCode(~~r[1]):e})},escapeRegExp:function(e){return e==null?"":t(e).replace(/([.*+?^=!:${}()|[\]\/\\])/g,"\\$1")},splice:function(e,t,n,r){var i=p.chars(e);return i.splice(~~t,~~n,r),i.join("")},insert:function(e,t,n){return p.splice(e,t,0,n)},include:function(e,n){return n===""?!0:e==null?!1:t(e).indexOf(n)!==-1},join:function(){var e=u.call(arguments),t=e.shift();return t==null&&(t=""),e.join(t)},lines:function(e){return e==null?[]:t(e).split("\n")},reverse:function(e){return p.chars(e).reverse().join("")},startsWith:function(e,n){return n===""?!0:e==null||n==null?!1:(e=t(e),n=t(n),e.length>=n.length&&e.slice(0,n.length)===n)},endsWith:function(e,n){return n===""?!0:e==null||n==null?!1:(e=t(e),n=t(n),e.length>=n.length&&e.slice(e.length-n.length)===n)},succ:function(e){return e==null?"":(e=t(e),e.slice(0,-1)+t.fromCharCode(e.charCodeAt(e.length-1)+1))},titleize:function(e){return e==null?"":t(e).replace(/(?:^|\s)\S/g,function(e){return e.toUpperCase()})},camelize:function(e){return p.trim(e).replace(/[-_\s]+(.)?/g,function(e,t){return t.toUpperCase()})},underscored:function(e){return p.trim(e).replace(/([a-z\d])([A-Z]+)/g,"$1_$2").replace(/[-\s]+/g,"_").toLowerCase()},dasherize:function(e){return p.trim(e).replace(/([A-Z])/g,"-$1").replace(/[-_\s]+/g,"-").toLowerCase()},classify:function(e){return p.titleize(t(e).replace(/_/g," ")).replace(/\s/g,"")},humanize:function(e){return p.capitalize(p.underscored(e).replace(/_id$/,"").replace(/_/g," "))},trim:function(e,r){return e==null?"":!r&&n?n.call(e):(r=a(r),t(e).replace(new RegExp("^"+r+"+|"+r+"+$","g"),""))},ltrim:function(e,n){return e==null?"":!n&&i?i.call(e):(n=a(n),t(e).replace(new RegExp("^"+n+"+"),""))},rtrim:function(e,n){return e==null?"":!n&&r?r.call(e):(n=a(n),t(e).replace(new RegExp(n+"+$"),""))},truncate:function(e,n,r){return e==null?"":(e=t(e),r=r||"...",n=~~n,e.length>n?e.slice(0,n)+r:e)},prune:function(e,n,r){if(e==null)return"";e=t(e),n=~~n,r=r!=null?t(r):"...";if(e.length<=n)return e;var i=function(e){return e.toUpperCase()!==e.toLowerCase()?"A":" "},s=e.slice(0,n+1).replace(/.(?=\W*\w*$)/g,i);return s.slice(s.length-2).match(/\w\w/)?s=s.replace(/\s*\S+$/,""):s=p.rtrim(s.slice(0,s.length-1)),(s+r).length>e.length?e:e.slice(0,s.length)+r},words:function(e,t){return p.isBlank(e)?[]:p.trim(e,t).split(t||/\s+/)},pad:function(e,n,r,i){e=e==null?"":t(e),n=~~n;var s=0;r?r.length>1&&(r=r.charAt(0)):r=" ";switch(i){case"right":return s=n-e.length,e+o(r,s);case"both":return s=n-e.length,o(r,Math.ceil(s/2))+e+o(r,Math.floor(s/2));default:return s=n-e.length,o(r,s)+e}},lpad:function(e,t,n){return p.pad(e,t,n)},rpad:function(e,t,n){return p.pad(e,t,n,"right")},lrpad:function(e,t,n){return p.pad(e,t,n,"both")},sprintf:h,vsprintf:function(e,t){return t.unshift(e),h.apply(null,t)},toNumber:function(e,n){if(e==null||e=="")return 0;e=t(e);var r=s(s(e).toFixed(~~n));return r===0&&!e.match(/^0+$/)?Number.NaN:r},numberFormat:function(e,t,n,r){if(isNaN(e)||e==null)return"";e=e.toFixed(~~t),r=r||",";var i=e.split("."),s=i[0],o=i[1]?(n||".")+i[1]:"";return s.replace(/(\d)(?=(?:\d{3})+$)/g,"$1"+r)+o},strRight:function(e,n){if(e==null)return"";e=t(e),n=n!=null?t(n):n;var r=n?e.indexOf(n):-1;return~r?e.slice(r+n.length,e.length):e},strRightBack:function(e,n){if(e==null)return"";e=t(e),n=n!=null?t(n):n;var r=n?e.lastIndexOf(n):-1;return~r?e.slice(r+n.length,e.length):e},strLeft:function(e,n){if(e==null)return"";e=t(e),n=n!=null?t(n):n;var r=n?e.indexOf(n):-1;return~r?e.slice(0,r):e},strLeftBack:function(e,t){if(e==null)return"";e+="",t=t!=null?""+t:t;var n=e.lastIndexOf(t);return~n?e.slice(0,n):e},toSentence:function(e,t,n,r){t=t||", ",n=n||" and ";var i=e.slice(),s=i.pop();return e.length>2&&r&&(n=p.rtrim(t)+n),i.length?i.join(t)+n+s:s},toSentenceSerial:function(){var e=u.call(arguments);return e[3]=!0,p.toSentence.apply(p,e)},slugify:function(e){if(e==null)return"";var n="ąàáäâãåæćęèéëêìíïîłńòóöôõøùúüûñçżź",r="aaaaaaaaceeeeeiiiilnoooooouuuunczz",i=new RegExp(a(n),"g");return e=t(e).toLowerCase().replace(i,function(e){var t=n.indexOf(e);return r.charAt(t)||"-"}),p.dasherize(e.replace(/[^\w\s-]/g,""))},surround:function(e,t){return[t,e,t].join("")},quote:function(e){return p.surround(e,'"')},exports:function(){var e={};for(var t in this){if(!this.hasOwnProperty(t)||t.match(/^(?:include|contains|reverse)$/))continue;e[t]=this[t]}return e},repeat:function(e,n,r){if(e==null)return"";n=~~n;if(r==null)return o(t(e),n);for(var i=[];n>0;i[--n]=e);return i.join(r)},levenshtein:function(e,n){if(e==null&&n==null)return 0;if(e==null)return t(n).length;if(n==null)return t(e).length;e=t(e),n=t(n);var r=[],i,s;for(var o=0;o<=n.length;o++)for(var u=0;u<=e.length;u++)o&&u?e.charAt(u-1)===n.charAt(o-1)?s=i:s=Math.min(r[u],r[u-1],i)+1:s=o+u,i=r[u],r[u]=s;return r.pop()}};p.strip=p.trim,p.lstrip=p.ltrim,p.rstrip=p.rtrim,p.center=p.lrpad,p.rjust=p.lpad,p.ljust=p.rpad,p.contains=p.include,p.q=p.quote,typeof exports!="undefined"?(typeof module!="undefined"&&module.exports&&(module.exports=p),exports._s=p):typeof define==="function"&&define.amd?define("underscore.string",[],function(){return p}):(e._=e._||{},e._.string=e._.str=p)}(this,String);
\ No newline at end of file
diff --git a/common/static/js/vendor/underscore.string.min.js b/common/static/js/vendor/underscore.string.min.js
new file mode 120000
index 000000000000..19e934b6c370
--- /dev/null
+++ b/common/static/js/vendor/underscore.string.min.js
@@ -0,0 +1 @@
+../../../../node_modules/underscore.string/dist/underscore.string.min.js
\ No newline at end of file
diff --git a/common/test/acceptance/pages/studio/overview.py b/common/test/acceptance/pages/studio/overview.py
index f3646a28f831..f8277a6b23f1 100644
--- a/common/test/acceptance/pages/studio/overview.py
+++ b/common/test/acceptance/pages/studio/overview.py
@@ -508,12 +508,6 @@ def change_section_name(self, new_name, parent_css=''):
         self.q(css='{} .section-name .save-button'.format(parent_css)).first.click()
         self.wait_for_ajax()
 
-    def click_release_date(self):
-        """
-        Open release date edit modal of first section in course outline
-        """
-        self.q(css='div.section-published-date a.edit-release-date').first.click()
-
     def sections(self):
         """
         Returns the sections of this course outline page.
diff --git a/lms/djangoapps/support/static/support/js/views/certificates.js b/lms/djangoapps/support/static/support/js/views/certificates.js
index 898d13a5fa7d..44ab8d877055 100644
--- a/lms/djangoapps/support/static/support/js/views/certificates.js
+++ b/lms/djangoapps/support/static/support/js/views/certificates.js
@@ -44,7 +44,7 @@
                     certificates: this.certificates
                 };
 
-                this.setResults(_.template(resultsTpl, context));
+                this.setResults(_.template(resultsTpl)(context));
             },
 
             renderError: function(error) {
diff --git a/lms/djangoapps/support/static/support/js/views/enrollment.js b/lms/djangoapps/support/static/support/js/views/enrollment.js
index 38e9dc863828..ae281ea67264 100644
--- a/lms/djangoapps/support/static/support/js/views/enrollment.js
+++ b/lms/djangoapps/support/static/support/js/views/enrollment.js
@@ -35,7 +35,7 @@
 
             render: function () {
                 var user = this.enrollments.user;
-                this.$el.html(_.template(enrollmentTemplate, {
+                this.$el.html(_.template(enrollmentTemplate)({
                     user: user,
                     enrollments: this.enrollments,
                     formatDate: function (date) {
diff --git a/lms/djangoapps/support/static/support/js/views/enrollment_modal.js b/lms/djangoapps/support/static/support/js/views/enrollment_modal.js
index 44315dc8dc44..21bb269bea76 100644
--- a/lms/djangoapps/support/static/support/js/views/enrollment_modal.js
+++ b/lms/djangoapps/support/static/support/js/views/enrollment_modal.js
@@ -21,7 +21,7 @@
             },
 
             render: function () {
-                this.$el.html(_.template(this.template, {
+                this.$el.html(_.template(this.template)({
                     enrollment: this.enrollment,
                     modes: this.modes,
                     reasons: this.reasons,
diff --git a/lms/djangoapps/teams/static/teams/js/views/team_profile.js b/lms/djangoapps/teams/static/teams/js/views/team_profile.js
index b5ddfcf37352..4c96174cdd90 100644
--- a/lms/djangoapps/teams/static/teams/js/views/team_profile.js
+++ b/lms/djangoapps/teams/static/teams/js/views/team_profile.js
@@ -31,7 +31,7 @@
                     var memberships = this.model.get('membership'),
                         discussionTopicID = this.model.get('discussion_topic_id'),
                         isMember = TeamUtils.isUserMemberOfTeam(memberships, this.context.userInfo.username);
-                    this.$el.html(_.template(teamTemplate, {
+                    this.$el.html(_.template(teamTemplate)({
                         courseID: this.context.courseID,
                         discussionTopicID: discussionTopicID,
                         readOnly: !(this.context.userInfo.privileged || isMember),
@@ -56,7 +56,7 @@
                 renderTeamMembers: function() {
                     var view = this;
                     _.each(this.model.get('membership'), function(membership) {
-                        view.$('.members-info').append(_.template(teamMemberTemplate, {
+                        view.$('.members-info').append(_.template(teamMemberTemplate)({
                             imageUrl: membership.user.profile_image.image_url_medium,
                             username: membership.user.username,
                             memberProfileUrl: '/u/' + membership.user.username
diff --git a/lms/djangoapps/teams/static/teams/js/views/topic_teams.js b/lms/djangoapps/teams/static/teams/js/views/topic_teams.js
index 1617d8cbb1af..316685a6c2d5 100644
--- a/lms/djangoapps/teams/static/teams/js/views/topic_teams.js
+++ b/lms/djangoapps/teams/static/teams/js/views/topic_teams.js
@@ -51,7 +51,7 @@
                                     'span_end': '</a>'
                                 }
                             );
-                            self.$el.append(_.template(teamActionsTemplate, {message: message}));
+                            self.$el.append(_.template(teamActionsTemplate)({message: message}));
                         }
                     });
                     return this;
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 4437ccdf2dad..c45abb39a2cc 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1237,6 +1237,7 @@
     'js/vendor/jquery.cookie.js',
     'js/vendor/url.min.js',
     'js/vendor/underscore-min.js',
+    'js/vendor/underscore.string.min.js',
     'js/vendor/requirejs/require.js',
     'js/RequireJS-namespace-undefine.js',
     'js/vendor/URI.min.js',
diff --git a/lms/static/coffee/src/instructor_dashboard/membership.coffee b/lms/static/coffee/src/instructor_dashboard/membership.coffee
index 15cd69d1466c..73f5023c8ae4 100644
--- a/lms/static/coffee/src/instructor_dashboard/membership.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/membership.coffee
@@ -117,7 +117,7 @@ class AuthListWidget extends MemberListWidget
 
         # create revoke button and insert it into the row
         label_trans = gettext("Revoke access")
-        $revoke_btn = $ _.template('<div class="revoke"><i class="icon fa fa-times-circle" aria-hidden="true"></i> <%= label %></div>', {label: label_trans}),
+        $revoke_btn = $ _.template('<div class="revoke"><i class="icon fa fa-times-circle" aria-hidden="true"></i> <%= label %></div>')({label: label_trans}),
           class: 'revoke'
         $revoke_btn.click =>
             @modify_member_access member.email, 'revoke', (error) =>
diff --git a/lms/static/coffee/src/instructor_dashboard/send_email.coffee b/lms/static/coffee/src/instructor_dashboard/send_email.coffee
index 9851658b5a46..a99e1480449a 100644
--- a/lms/static/coffee/src/instructor_dashboard/send_email.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/send_email.coffee
@@ -62,7 +62,7 @@ class SendEmail
           success_message = gettext("Your email was successfully queued for sending. Please note that for large classes, it may take up to an hour (or more, if other courses are simultaneously sending email) to send all emails.")
 
         subject = @$subject.val()
-        full_confirm_message = _.template(confirm_message, {subject: subject})
+        full_confirm_message = _.template(confirm_message)({subject: subject})
 
         if confirm full_confirm_message
 
diff --git a/lms/static/coffee/src/instructor_dashboard/student_admin.coffee b/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
index cabef93b0c24..8dd8a19bcd4e 100644
--- a/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
@@ -73,7 +73,7 @@ class @StudentAdmin
       if not unique_student_identifier
         return @$request_response_error_progress.text gettext("Please enter a student email address or username.")
       error_message = gettext("Error getting student progress url for '<%= student_id %>'. Make sure that the student identifier is spelled correctly.")
-      full_error_message = _.template(error_message, {student_id: unique_student_identifier})
+      full_error_message = _.template(error_message)({student_id: unique_student_identifier})
 
       $.ajax
         dataType: 'json'
@@ -97,8 +97,8 @@ class @StudentAdmin
         delete_module: false
       success_message = gettext("Success! Problem attempts reset for problem '<%= problem_id %>' and student '<%= student_id %>'.")
       error_message = gettext("Error resetting problem attempts for problem '<%= problem_id %>' and student '<%= student_id %>'. Make sure that the problem and student identifiers are complete and correct.")
-      full_success_message = _.template(success_message, {problem_id: problem_to_reset, student_id: unique_student_identifier})
-      full_error_message = _.template(error_message, {problem_id: problem_to_reset, student_id: unique_student_identifier})
+      full_success_message = _.template(success_message)({problem_id: problem_to_reset, student_id: unique_student_identifier})
+      full_error_message = _.template(error_message)({problem_id: problem_to_reset, student_id: unique_student_identifier})
 
       $.ajax
         dataType: 'json'
@@ -116,7 +116,7 @@ class @StudentAdmin
       if not problem_to_reset
         return @$request_response_error_grade.text gettext("Please enter a problem location.")
       confirm_message = gettext("Delete student '<%= student_id %>'s state on problem '<%= problem_id %>'?")
-      full_confirm_message = _.template(confirm_message, {student_id: unique_student_identifier, problem_id: problem_to_reset})
+      full_confirm_message = _.template(confirm_message)({student_id: unique_student_identifier, problem_id: problem_to_reset})
 
       if window.confirm full_confirm_message
         send_data =
@@ -124,7 +124,7 @@ class @StudentAdmin
           problem_to_reset: problem_to_reset
           delete_module: true
         error_message = gettext("Error deleting student '<%= student_id %>'s state on problem '<%= problem_id %>'. Make sure that the problem and student identifiers are complete and correct.")
-        full_error_message = _.template(error_message, {student_id: unique_student_identifier, problem_id: problem_to_reset})
+        full_error_message = _.template(error_message)({student_id: unique_student_identifier, problem_id: problem_to_reset})
 
         $.ajax
           dataType: 'json'
@@ -148,9 +148,9 @@ class @StudentAdmin
         unique_student_identifier: unique_student_identifier
         problem_to_reset: problem_to_reset
       success_message = gettext("Started rescore problem task for problem '<%= problem_id %>' and student '<%= student_id %>'. Click the 'Show Background Task History for Student' button to see the status of the task.")
-      full_success_message = _.template(success_message, {student_id: unique_student_identifier, problem_id: problem_to_reset})
+      full_success_message = _.template(success_message)({student_id: unique_student_identifier, problem_id: problem_to_reset})
       error_message = gettext("Error starting a task to rescore problem '<%= problem_id %>' for student '<%= student_id %>'. Make sure that the the problem and student identifiers are complete and correct.")
-      full_error_message = _.template(error_message, {student_id: unique_student_identifier, problem_id: problem_to_reset})
+      full_error_message = _.template(error_message)({student_id: unique_student_identifier, problem_id: problem_to_reset})
 
       $.ajax
         dataType: 'json'
@@ -171,7 +171,7 @@ class @StudentAdmin
         unique_student_identifier: unique_student_identifier
         problem_location_str: problem_to_reset
       error_message = gettext("Error getting task history for problem '<%= problem_id %>' and student '<%= student_id %>'. Make sure that the problem and student identifiers are complete and correct.")
-      full_error_message = _.template(error_message, {student_id: unique_student_identifier, problem_id: problem_to_reset})
+      full_error_message = _.template(error_message)({student_id: unique_student_identifier, problem_id: problem_to_reset})
 
       $.ajax
         dataType: 'json'
@@ -293,15 +293,15 @@ class @StudentAdmin
       if not problem_to_reset
         return @$request_response_error_all.text gettext("Please enter a problem location.")
       confirm_message = gettext("Reset attempts for all students on problem '<%= problem_id %>'?")
-      full_confirm_message = _.template(confirm_message, {problem_id: problem_to_reset})
+      full_confirm_message = _.template(confirm_message)({problem_id: problem_to_reset})
       if window.confirm full_confirm_message
         send_data =
           all_students: true
           problem_to_reset: problem_to_reset
         success_message = gettext("Successfully started task to reset attempts for problem '<%= problem_id %>'. Click the 'Show Background Task History for Problem' button to see the status of the task.")
-        full_success_message = _.template(success_message, {problem_id: problem_to_reset})
+        full_success_message = _.template(success_message)({problem_id: problem_to_reset})
         error_message = gettext("Error starting a task to reset attempts for all students on problem '<%= problem_id %>'. Make sure that the problem identifier is complete and correct.")
-        full_error_message = _.template(error_message, {problem_id: problem_to_reset})
+        full_error_message = _.template(error_message)({problem_id: problem_to_reset})
 
         $.ajax
           dataType: 'json'
@@ -319,15 +319,15 @@ class @StudentAdmin
       if not problem_to_reset
         return @$request_response_error_all.text gettext("Please enter a problem location.")
       confirm_message = gettext("Rescore problem '<%= problem_id %>' for all students?")
-      full_confirm_message = _.template(confirm_message, {problem_id: problem_to_reset})
+      full_confirm_message = _.template(confirm_message)({problem_id: problem_to_reset})
       if window.confirm full_confirm_message
         send_data =
           all_students: true
           problem_to_reset: problem_to_reset
         success_message = gettext("Successfully started task to rescore problem '<%= problem_id %>' for all students. Click the 'Show Background Task History for Problem' button to see the status of the task.")
-        full_success_message = _.template(success_message, {problem_id: problem_to_reset})
+        full_success_message = _.template(success_message)({problem_id: problem_to_reset})
         error_message = gettext("Error starting a task to rescore problem '<%= problem_id %>'. Make sure that the problem identifier is complete and correct.")
-        full_error_message = _.template(error_message, {problem_id: problem_to_reset})
+        full_error_message = _.template(error_message)({problem_id: problem_to_reset})
 
         $.ajax
           dataType: 'json'
diff --git a/lms/static/js/Markdown.Editor.js b/lms/static/js/Markdown.Editor.js
index 8be91adde1a0..90712ed422c8 100644
--- a/lms/static/js/Markdown.Editor.js
+++ b/lms/static/js/Markdown.Editor.js
@@ -1134,7 +1134,7 @@
             // The main dialog box.
             dialog = doc.createElement("div");
             dialog.innerHTML = _.template(
-                document.getElementById("customwmd-prompt-template").innerHTML, {
+                document.getElementById("customwmd-prompt-template").innerHTML)({
                 title: title,
                 uploadFieldClass: (imageUploadHandler ? 'file-upload' : ''),
                 urlLabel: urlLabel,
diff --git a/lms/static/js/certificates/models/certificate_exception.js b/lms/static/js/certificates/models/certificate_exception.js
index 8385c7185ef1..c07a473fe8d6 100644
--- a/lms/static/js/certificates/models/certificate_exception.js
+++ b/lms/static/js/certificates/models/certificate_exception.js
@@ -30,7 +30,7 @@
                 },
 
                 validate: function(attrs){
-                    if (!_.str.trim(attrs.user_name) && !_.str.trim(attrs.user_email)) {
+                    if (!str.trim(attrs.user_name) && !str.trim(attrs.user_email)) {
                         return gettext('Student username/email field is required and can not be empty. ' +
                             'Kindly fill in username/email and then press "Add to Exception List" button.');
                     }
diff --git a/lms/static/js/certificates/models/certificate_invalidation.js b/lms/static/js/certificates/models/certificate_invalidation.js
index 7c6ccb338ae0..a58dad859eab 100644
--- a/lms/static/js/certificates/models/certificate_invalidation.js
+++ b/lms/static/js/certificates/models/certificate_invalidation.js
@@ -8,6 +8,7 @@
         ['underscore', 'underscore.string', 'gettext', 'backbone'],
 
         function(_, str, gettext, Backbone) {
+
             return Backbone.Model.extend({
                 idAttribute: 'id',
 
@@ -23,7 +24,7 @@
                 },
 
                 validate: function(attrs) {
-                    if (!_.str.trim(attrs.user)) {
+                    if (!str.trim(attrs.user)) {
                         // A username or email must be provided for certificate invalidation
                         return gettext('Student username/email field is required and can not be empty. ' +
                             'Kindly fill in username/email and then press "Invalidate Certificate" button.');
diff --git a/lms/static/js/certificates/views/certificate_invalidation_view.js b/lms/static/js/certificates/views/certificate_invalidation_view.js
index 316713d6a8b3..4edc3004f617 100644
--- a/lms/static/js/certificates/views/certificate_invalidation_view.js
+++ b/lms/static/js/certificates/views/certificate_invalidation_view.js
@@ -43,7 +43,7 @@
 
                     if (this.collection.findWhere({user: user})) {
                         message = gettext("Certificate of <%= user %> has already been invalidated. Please check your spelling and retry."); // jshint ignore:line
-                        this.escapeAndShowMessage(_.template(message, {user: user}));
+                        this.escapeAndShowMessage(_.template(message)({user: user}));
                     }
                     else if (certificate_invalidation.isValid()) {
                         var self = this;
@@ -53,7 +53,7 @@
                             success: function(model) {
                                 self.collection.add(model);
                                 message = gettext('Certificate has been successfully invalidated for <%= user %>.');
-                                self.escapeAndShowMessage(_.template(message, {user: user}));
+                                self.escapeAndShowMessage(_.template(message)({user: user}));
                             },
 
                             error: function(model, response) {
diff --git a/lms/static/js/certificates/views/certificate_whitelist_editor.js b/lms/static/js/certificates/views/certificate_whitelist_editor.js
index 4fd42bd58fe1..c2f0c6ff9da9 100644
--- a/lms/static/js/certificates/views/certificate_whitelist_editor.js
+++ b/lms/static/js/certificates/views/certificate_whitelist_editor.js
@@ -56,7 +56,7 @@
                     if(this.collection.findWhere(model)){
                         message = gettext("<%= user %> already in exception list.");
                         this.escapeAndShowMessage(
-                            _.template(message, {user: (user_name || user_email)})
+                            _.template(message)({user: (user_name || user_email)})
                         );
                     }
                     else if(certificate_exception.isValid()){
@@ -67,7 +67,7 @@
                                 success: this.showSuccess(
                                     this,
                                     true,
-                                    _.template(message, {user: (user_name || user_email)})
+                                    _.template(message)({user: (user_name || user_email)})
                                 ),
                                 error: this.showError(this)
                             }
diff --git a/lms/static/js/commerce/views/receipt_view.js b/lms/static/js/commerce/views/receipt_view.js
index 3263c70f3391..336430b62896 100644
--- a/lms/static/js/commerce/views/receipt_view.js
+++ b/lms/static/js/commerce/views/receipt_view.js
@@ -43,7 +43,7 @@ var edx = edx || {};
                 courseKey: this.courseKey
             });
 
-            this.$el.html(_.template(templateHtml, context));
+            this.$el.html(_.template(templateHtml)(context));
 
             this.trackLinks();
 
@@ -69,7 +69,7 @@ var edx = edx || {};
             context.course_key = this.courseKey;
             context.username = this.username;
             context.platformName = this.$el.data('platform-name');
-            providerDiv.html(_.template(templateHtml, context)).removeClass('hidden');
+            providerDiv.html(_.template(templateHtml)(context)).removeClass('hidden');
         },
 
         renderError: function () {
diff --git a/lms/static/js/components/tabbed/views/tabbed_view.js b/lms/static/js/components/tabbed/views/tabbed_view.js
index 70d4afe43ce9..367a803ef31c 100644
--- a/lms/static/js/components/tabbed/views/tabbed_view.js
+++ b/lms/static/js/components/tabbed/views/tabbed_view.js
@@ -71,7 +71,7 @@
                        var self = this;
                        this.$el.html(this.template({}));
                        _.each(this.tabs, function(tabInfo, index) {
-                           var tabEl = $(_.template(tabTemplate, {
+                           var tabEl = $(_.template(tabTemplate)({
                                    index: index,
                                    title: tabInfo.title,
                                    url: tabInfo.url,
diff --git a/lms/static/js/dashboard/donation.js b/lms/static/js/dashboard/donation.js
index 32466398238e..82dd83660d1d 100644
--- a/lms/static/js/dashboard/donation.js
+++ b/lms/static/js/dashboard/donation.js
@@ -97,7 +97,7 @@ var edx = edx || {};
             * @returns {DonationView}
             */
             render: function() {
-                var html = _.template($("#donation-tpl").html(), {});
+                var html = _.template($("#donation-tpl").html())({});
                 this.$el.html(html);
                 this.$amount = $("input[name=\"amount\"]", this.$el);
                 this.$submit = $(".action-donate", this.$el);
diff --git a/lms/static/js/financial-assistance/views/financial_assistance_form_view.js b/lms/static/js/financial-assistance/views/financial_assistance_form_view.js
index dd1799ab9825..6dbb1770ac3c 100644
--- a/lms/static/js/financial-assistance/views/financial_assistance_form_view.js
+++ b/lms/static/js/financial-assistance/views/financial_assistance_form_view.js
@@ -76,7 +76,7 @@
                         fields: html || '',
                     });
 
-                    this.$el.html(_.template(this.tpl, data));
+                    this.$el.html(_.template(this.tpl)(data));
 
                     this.postRender();
                     this.validateCountry();
@@ -85,7 +85,7 @@
                 },
 
                 renderSuccess: function() {
-                    this.$el.html(_.template(successTpl, {
+                    this.$el.html(_.template(successTpl)({
                         course: this.model.get('course'),
                         dashboard_url: this.context.dashboard_url
                     }));
diff --git a/lms/static/js/spec/edxnotes/plugins/accessibility_spec.js b/lms/static/js/spec/edxnotes/plugins/accessibility_spec.js
index b135be816362..f4128df9b7c6 100644
--- a/lms/static/js/spec/edxnotes/plugins/accessibility_spec.js
+++ b/lms/static/js/spec/edxnotes/plugins/accessibility_spec.js
@@ -37,7 +37,9 @@ define([
         });
 
         afterEach(function () {
-            _.invoke(Annotator._instances, 'destroy');
+            while (Annotator._instances.length > 0) {
+                Annotator._instances[0].destroy();
+            }
         });
 
         describe('destroy', function () {
diff --git a/lms/static/js/spec/edxnotes/plugins/caret_navigation_spec.js b/lms/static/js/spec/edxnotes/plugins/caret_navigation_spec.js
index 79820dd252ef..4bd20371bf9b 100644
--- a/lms/static/js/spec/edxnotes/plugins/caret_navigation_spec.js
+++ b/lms/static/js/spec/edxnotes/plugins/caret_navigation_spec.js
@@ -16,7 +16,9 @@ define([
         });
 
         afterEach(function () {
-            _.invoke(Annotator._instances, 'destroy');
+            while (Annotator._instances.length > 0) {
+                Annotator._instances[0].destroy();
+            }
         });
 
         describe('destroy', function () {
diff --git a/lms/static/js/spec/edxnotes/plugins/events_spec.js b/lms/static/js/spec/edxnotes/plugins/events_spec.js
index 1c3101574a58..1aec1fdefef3 100644
--- a/lms/static/js/spec/edxnotes/plugins/events_spec.js
+++ b/lms/static/js/spec/edxnotes/plugins/events_spec.js
@@ -31,7 +31,9 @@ define([
         });
 
         afterEach(function () {
-            _.invoke(Annotator._instances, 'destroy');
+            while (Annotator._instances.length > 0) {
+                Annotator._instances[0].destroy();
+            }
         });
 
         it('should log edx.course.student_notes.viewed event properly', function() {
diff --git a/lms/static/js/spec/edxnotes/plugins/scroller_spec.js b/lms/static/js/spec/edxnotes/plugins/scroller_spec.js
index 9846dfe27781..77c1d7eeb23f 100644
--- a/lms/static/js/spec/edxnotes/plugins/scroller_spec.js
+++ b/lms/static/js/spec/edxnotes/plugins/scroller_spec.js
@@ -46,7 +46,9 @@ define([
         });
 
         afterEach(function () {
-            _.invoke(Annotator._instances, 'destroy');
+            while (Annotator._instances.length > 0) {
+                Annotator._instances[0].destroy();
+            }
         });
 
         it('should scroll to a note, open it and freeze the annotator if its id is part of the url hash', function() {
diff --git a/lms/static/js/spec/edxnotes/views/notes_factory_spec.js b/lms/static/js/spec/edxnotes/views/notes_factory_spec.js
index 7ccd6bc1a796..dda98b8b5925 100644
--- a/lms/static/js/spec/edxnotes/views/notes_factory_spec.js
+++ b/lms/static/js/spec/edxnotes/views/notes_factory_spec.js
@@ -11,7 +11,9 @@ define([
         });
 
         afterEach(function () {
-            _.invoke(Annotator._instances, 'destroy');
+            while (Annotator._instances.length > 0) {
+                Annotator._instances[0].destroy();
+            }
         });
 
         it('can initialize annotator correctly', function() {
diff --git a/lms/static/js/spec/edxnotes/views/notes_visibility_factory_spec.js b/lms/static/js/spec/edxnotes/views/notes_visibility_factory_spec.js
index 977b381c0798..cf2f3fa7ff45 100644
--- a/lms/static/js/spec/edxnotes/views/notes_visibility_factory_spec.js
+++ b/lms/static/js/spec/edxnotes/views/notes_visibility_factory_spec.js
@@ -37,7 +37,9 @@ define([
 
         afterEach(function () {
             NotesVisibilityFactory.VisibilityDecorator._setVisibility(null);
-            _.invoke(Annotator._instances, 'destroy');
+            while (Annotator._instances.length > 0) {
+                Annotator._instances[0].destroy();
+            }
             $('.annotator-notice').remove();
         });
 
diff --git a/lms/static/js/spec/edxnotes/views/shim_spec.js b/lms/static/js/spec/edxnotes/views/shim_spec.js
index dfd69c6f06d6..c568f6cb130e 100644
--- a/lms/static/js/spec/edxnotes/views/shim_spec.js
+++ b/lms/static/js/spec/edxnotes/views/shim_spec.js
@@ -46,7 +46,9 @@ define([
         });
 
         afterEach(function () {
-            _.invoke(Annotator._instances, 'destroy');
+            while (Annotator._instances.length > 0) {
+                Annotator._instances[0].destroy();
+            }
         });
 
         it('does not show the viewer if the editor is opened', function() {
diff --git a/lms/static/js/spec/edxnotes/views/visibility_decorator_spec.js b/lms/static/js/spec/edxnotes/views/visibility_decorator_spec.js
index 61dbd18b177a..ddd9c651b1e7 100644
--- a/lms/static/js/spec/edxnotes/views/visibility_decorator_spec.js
+++ b/lms/static/js/spec/edxnotes/views/visibility_decorator_spec.js
@@ -21,7 +21,9 @@ define([
 
         afterEach(function () {
             VisibilityDecorator._setVisibility(null);
-            _.invoke(Annotator._instances, 'destroy');
+            while (Annotator._instances.length > 0) {
+                Annotator._instances[0].destroy();
+            }
         });
 
         it('can initialize Notes if it visibility equals True', function() {
diff --git a/lms/static/js/spec/main.js b/lms/static/js/spec/main.js
index 38afce6eec6f..96a6529e0f62 100644
--- a/lms/static/js/spec/main.js
+++ b/lms/static/js/spec/main.js
@@ -181,22 +181,7 @@
             },
             'underscore': {
                 deps: ['underscore.string'],
-                exports: '_',
-                init: function(UnderscoreString) {
-                    /* Mix non-conflicting functions from underscore.string
-                     * (all but include, contains, and reverse) into the
-                     * Underscore namespace. This allows the login, register,
-                     * and password reset templates to render independent of the
-                     * access view.
-                     */
-                    _.mixin(UnderscoreString.exports());
-
-                    /* Since the access view is not using RequireJS, we also
-                     * expose underscore.string at _.str, so that the access
-                     * view can perform the mixin on its own.
-                     */
-                    _.str = UnderscoreString;
-                }
+                exports: '_'
             },
             'backbone': {
                 deps: ['underscore', 'jquery'],
@@ -374,7 +359,12 @@
             },
             'js/verify_student/views/step_view': {
                 exports: 'edx.verify_student.StepView',
-                deps: [ 'jquery', 'underscore', 'underscore.string', 'backbone', 'gettext' ]
+                deps: [ 'jquery', 'underscore', 'underscore.string', 'backbone', 'gettext' ],
+                init: function() {
+                    // Set global variables that the payment code is expecting to be defined
+                    window._ = require('underscore');
+                    window._.str = require('underscore.string');
+                }
             },
             'js/verify_student/views/intro_step_view': {
                 exports: 'edx.verify_student.IntroStepView',
@@ -515,12 +505,6 @@
                 ],
                 exports: 'Discussion'
             },
-            'xmodule_js/common_static/coffee/src/discussion/discussion_filter': {
-                deps: [
-                    'xmodule_js/common_static/coffee/src/discussion/utils'
-                ],
-                exports: 'DiscussionFilter'
-            },
             'xmodule_js/common_static/coffee/src/discussion/models/discussion_course_settings': {
                 deps: [
                     'xmodule_js/common_static/coffee/src/discussion/utils'
@@ -614,7 +598,6 @@
                     'URI',
                     'xmodule_js/common_static/coffee/src/discussion/content',
                     'xmodule_js/common_static/coffee/src/discussion/discussion',
-                    'xmodule_js/common_static/coffee/src/discussion/discussion_filter',
                     'xmodule_js/common_static/coffee/src/discussion/utils',
                     'xmodule_js/common_static/coffee/src/discussion/models/discussion_course_settings',
                     'xmodule_js/common_static/coffee/src/discussion/models/discussion_user',
diff --git a/lms/static/js/spec/verify_student/reverify_view_spec.js b/lms/static/js/spec/verify_student/reverify_view_spec.js
index 52399d47c951..b22236fb2b52 100644
--- a/lms/static/js/spec/verify_student/reverify_view_spec.js
+++ b/lms/static/js/spec/verify_student/reverify_view_spec.js
@@ -8,7 +8,6 @@ define(['jquery', 'common/js/spec_helpers/template_helpers', 'js/verify_student/
         describe( 'edx.verify_student.ReverifyView', function() {
 
             var TEMPLATES = [
-                "reverify",
                 "webcam_photo",
                 "image_input",
                 "error",
diff --git a/lms/static/js/staff_debug_actions.js b/lms/static/js/staff_debug_actions.js
index 38419697d7f8..5774a4335692 100644
--- a/lms/static/js/staff_debug_actions.js
+++ b/lms/static/js/staff_debug_actions.js
@@ -35,15 +35,11 @@ var StaffDebug = (function (){
         url: get_url(action.method),
         data: pdata,
         success: function(data){
-            var text = _.template(
-                action.success_msg,
-                {user: data.student},
-                {interpolate: /\{(.+?)\}/g}
+            var text = _.template(action.success_msg, {interpolate: /\{(.+?)\}/g})(
+                {user: data.student}
             );
-            var html = _.template(
-                '<p id="idash_msg" class="success">{text}</p>',
-                {text: text},
-                {interpolate: /\{(.+?)\}/g}
+            var html = _.template('<p id="idash_msg" class="success">{text}</p>', {interpolate: /\{(.+?)\}/g})(
+                {text: text}
             );
             $("#result_"+sanitized_string(action.locationName)).html(html);
         },
@@ -54,18 +50,14 @@ var StaffDebug = (function (){
             } catch(e) {
                 response_json = { error: gettext('Unknown Error Occurred.') };
             }
-            var text = _.template(
-                '{error_msg} {error}',
+            var text = _.template('{error_msg} {error}', {interpolate: /\{(.+?)\}/g})(
                 {
                     error_msg: action.error_msg,
                     error: response_json.error
-                },
-                {interpolate: /\{(.+?)\}/g}
+                }
             );
-            var html = _.template(
-                '<p id="idash_msg" class="error">{text}</p>',
-                {text: text},
-                {interpolate: /\{(.+?)\}/g}
+            var html = _.template('<p id="idash_msg" class="error">{text}</p>', {interpolate: /\{(.+?)\}/g})(
+                {text: text}
             );
             $("#result_"+sanitized_string(action.locationName)).html(html);
 
diff --git a/lms/static/js/student_account/account.js b/lms/static/js/student_account/account.js
index 9569ed42c946..f8ad63d5e370 100644
--- a/lms/static/js/student_account/account.js
+++ b/lms/static/js/student_account/account.js
@@ -84,7 +84,7 @@ var edx = edx || {};
         },
 
         render: function() {
-            this.$el.html(_.template($('#account-tpl').html(), {}));
+            this.$el.html(_.template($('#account-tpl').html())({}));
             this.$email = $('#new-email', this.$el);
             this.$password = $('#password', this.$el);
             this.$emailStatus = $('#new-email-status', this.$el);
@@ -113,7 +113,7 @@ var edx = edx || {};
             event.preventDefault();
             this.clearStatus();
 
-            self = this;
+            var self = this;
             $.ajax({
                 url: 'password',
                 type: 'POST',
diff --git a/lms/static/js/student_account/views/AccessView.js b/lms/static/js/student_account/views/AccessView.js
index 88c74b2ad540..a2dce464b9ad 100644
--- a/lms/static/js/student_account/views/AccessView.js
+++ b/lms/static/js/student_account/views/AccessView.js
@@ -19,10 +19,6 @@
         function($, utility, _, _s, Backbone, LoginModel, PasswordResetModel, RegisterModel, LoginView,
                  PasswordResetView, RegisterView, InstitutionLoginView, HintedLoginView) {
 
-        if (_.isUndefined(_s)) {
-            _s = _.str;
-        }
-
         return Backbone.View.extend({
             tpl: '#access-tpl',
             events: {
@@ -89,7 +85,7 @@
             },
 
             render: function() {
-                $(this.el).html( _.template( this.tpl, {
+                $(this.el).html( _.template(this.tpl)({
                     mode: this.activeForm
                 }));
 
diff --git a/lms/static/js/student_account/views/FormView.js b/lms/static/js/student_account/views/FormView.js
index 42fb614a76b0..5e98e2bb4b63 100644
--- a/lms/static/js/student_account/views/FormView.js
+++ b/lms/static/js/student_account/views/FormView.js
@@ -55,7 +55,7 @@
             render: function( html ) {
                 var fields = html || '';
 
-                $(this.el).html( _.template( this.tpl, {
+                $(this.el).html( _.template(this.tpl)({
                     fields: fields
                 }));
 
@@ -84,7 +84,7 @@
                         data[i].errorMessages = this.escapeStrings( data[i].errorMessages );
                     }
 
-                    html.push( _.template( fieldTpl, $.extend( data[i], {
+                    html.push( _.template(fieldTpl)($.extend( data[i], {
                         form: this.formType,
                         requiredStr: this.requiredStr
                     }) ) );
diff --git a/lms/static/js/student_account/views/HintedLoginView.js b/lms/static/js/student_account/views/HintedLoginView.js
index 4b937b707b2e..bd35ddbad9b0 100644
--- a/lms/static/js/student_account/views/HintedLoginView.js
+++ b/lms/static/js/student_account/views/HintedLoginView.js
@@ -23,7 +23,7 @@
             },
 
             render: function() {
-                $(this.el).html( _.template( this.tpl, {
+                $(this.el).html(_.template(this.tpl)({
                     hintedProvider: this.hintedProvider
                 }));
 
diff --git a/lms/static/js/student_account/views/InstitutionLoginView.js b/lms/static/js/student_account/views/InstitutionLoginView.js
index 3ba27f8b82ea..8f191d5d3ceb 100644
--- a/lms/static/js/student_account/views/InstitutionLoginView.js
+++ b/lms/static/js/student_account/views/InstitutionLoginView.js
@@ -14,7 +14,7 @@
             },
 
             render: function() {
-                $(this.el).html( _.template( this.tpl, {
+                $(this.el).html(_.template(this.tpl)({
                     // We pass the context object to the template so that
                     // we can perform variable interpolation using sprintf
                     providers: this.providers,
diff --git a/lms/static/js/student_account/views/LoginView.js b/lms/static/js/student_account/views/LoginView.js
index 265455e13f45..73f2695aa170 100644
--- a/lms/static/js/student_account/views/LoginView.js
+++ b/lms/static/js/student_account/views/LoginView.js
@@ -37,7 +37,7 @@
             render: function( html ) {
                 var fields = html || '';
 
-                $(this.el).html( _.template( this.tpl, {
+                $(this.el).html(_.template(this.tpl)({
                     // We pass the context object to the template so that
                     // we can perform variable interpolation using sprintf
                     context: {
diff --git a/lms/static/js/student_account/views/RegisterView.js b/lms/static/js/student_account/views/RegisterView.js
index 9e8d6903a6af..416b1c088f76 100644
--- a/lms/static/js/student_account/views/RegisterView.js
+++ b/lms/static/js/student_account/views/RegisterView.js
@@ -37,7 +37,7 @@
             render: function( html ) {
                 var fields = html || '';
 
-                $(this.el).html( _.template( this.tpl, {
+                $(this.el).html(_.template(this.tpl)({
                     /* We pass the context object to the template so that
                      * we can perform variable interpolation using sprintf
                      */
diff --git a/lms/static/js/student_account/views/account_settings_view.js b/lms/static/js/student_account/views/account_settings_view.js
index 9c7950f61c06..f3710d5f042a 100644
--- a/lms/static/js/student_account/views/account_settings_view.js
+++ b/lms/static/js/student_account/views/account_settings_view.js
@@ -11,7 +11,7 @@
             },
 
             render: function () {
-                this.$el.html(_.template(accountSettingsTemplate, {
+                this.$el.html(_.template(accountSettingsTemplate)({
                     sections: this.options.sectionsData
                 }));
                 return this;
diff --git a/lms/static/js/student_profile/views/learner_profile_view.js b/lms/static/js/student_profile/views/learner_profile_view.js
index cc0c518fe879..b652c4fe86cc 100644
--- a/lms/static/js/student_profile/views/learner_profile_view.js
+++ b/lms/static/js/student_profile/views/learner_profile_view.js
@@ -21,7 +21,7 @@
             },
 
             render: function () {
-                this.$el.html(_.template(learnerProfileTemplate, {
+                this.$el.html(_.template(learnerProfileTemplate)({
                     username: this.options.accountSettingsModel.get('username'),
                     ownProfile: this.options.ownProfile,
                     showFullProfile: this.showFullProfile()
diff --git a/lms/static/js/verify_student/views/error_view.js b/lms/static/js/verify_student/views/error_view.js
index 085cb783363a..67f385a14fb7 100644
--- a/lms/static/js/verify_student/views/error_view.js
+++ b/lms/static/js/verify_student/views/error_view.js
@@ -21,8 +21,7 @@
         },
 
         render: function() {
-            var renderedHtml = _.template(
-                $( '#error-tpl' ).html(),
+            var renderedHtml = _.template($( '#error-tpl' ).html())(
                 {
                     errorTitle: this.model.get( 'errorTitle' ),
                     errorMsg: this.model.get( 'errorMsg' )
diff --git a/lms/static/js/verify_student/views/image_input_view.js b/lms/static/js/verify_student/views/image_input_view.js
index 4c6724270b90..3b0ef721b288 100644
--- a/lms/static/js/verify_student/views/image_input_view.js
+++ b/lms/static/js/verify_student/views/image_input_view.js
@@ -24,7 +24,7 @@
         },
 
         render: function() {
-            var renderedHtml = _.template( $( this.template ).html(), {} );
+            var renderedHtml = _.template( $( this.template ).html())({});
             $( this.el ).html( renderedHtml );
 
             // Set the submit button to disabled by default
diff --git a/lms/static/js/verify_student/views/incourse_reverify_view.js b/lms/static/js/verify_student/views/incourse_reverify_view.js
index 110f682bd8bf..ed57e692aa6c 100644
--- a/lms/static/js/verify_student/views/incourse_reverify_view.js
+++ b/lms/static/js/verify_student/views/incourse_reverify_view.js
@@ -40,8 +40,7 @@
         },
 
         render: function() {
-            var renderedTemplate = _.template(
-                $( this.templateId ).html(),
+            var renderedTemplate = _.template($( this.templateId ).html())(
                 {
                     courseKey: this.courseKey,
                     platformName: this.platformName
diff --git a/lms/static/js/verify_student/views/step_view.js b/lms/static/js/verify_student/views/step_view.js
index 96ad8c2d4fe1..b752e0393b8f 100644
--- a/lms/static/js/verify_student/views/step_view.js
+++ b/lms/static/js/verify_student/views/step_view.js
@@ -1,3 +1,5 @@
+/*global jQuery, _, Backbone, gettext */
+
 /**
  * Base view for defining steps in the payment/verification flow.
  *
@@ -8,7 +10,7 @@
  */
  var edx = edx || {};
 
- (function( $, _, _s, Backbone, gettext ) {
+ (function( $, _, Backbone, gettext ) {
     'use strict';
 
     edx.verify_student = edx.verify_student || {};
@@ -20,9 +22,9 @@
 
             /* Mix non-conflicting functions from underscore.string
              * (all but include, contains, and reverse) into the
-             * Underscore namespace
+             * Underscore namespace.
              */
-            _.mixin( _s.exports() );
+            _.mixin(_.str.exports());
         },
 
         render: function() {
@@ -33,7 +35,7 @@
             this.updateContext( this.templateContext() ).done(
                 function( templateContext ) {
                     // Render the template into the DOM
-                    $( this.el ).html( _.template( templateHtml, templateContext ) );
+                    $( this.el ).html( _.template( templateHtml)( templateContext ) );
 
                     // Allow subclasses to install custom event handlers
                     this.postRender();
@@ -101,4 +103,4 @@
 
     });
 
- })( jQuery, _, _.str, Backbone, gettext );
+ })( jQuery, _, Backbone, gettext );
diff --git a/lms/static/js/verify_student/views/webcam_photo_view.js b/lms/static/js/verify_student/views/webcam_photo_view.js
index ea1c84a658ab..da90f65738db 100644
--- a/lms/static/js/verify_student/views/webcam_photo_view.js
+++ b/lms/static/js/verify_student/views/webcam_photo_view.js
@@ -242,8 +242,7 @@
             this.setSubmitButtonEnabled( false );
 
             // Load the template for the webcam into the DOM
-            renderedHtml = _.template(
-                $( this.template ).html(),
+            renderedHtml = _.template($( this.template ).html())(
                 { backendName: this.backend.name }
             );
             $( this.el ).html( renderedHtml );
diff --git a/lms/static/js/views/message_banner.js b/lms/static/js/views/message_banner.js
index 867fbbba9963..8dc6157215b8 100644
--- a/lms/static/js/views/message_banner.js
+++ b/lms/static/js/views/message_banner.js
@@ -17,7 +17,7 @@
                 if (_.isUndefined(this.message) || _.isNull(this.message)) {
                     this.$el.html('');
                 } else {
-                    this.$el.html(_.template(messageBannerTemplate, _.extend(this.options, {
+                    this.$el.html(_.template(messageBannerTemplate)(_.extend(this.options, {
                         message: this.message
                     })));
                 }
diff --git a/lms/static/lms/js/build.js b/lms/static/lms/js/build.js
index 75ccb6964e76..eb61aaafd1f4 100644
--- a/lms/static/lms/js/build.js
+++ b/lms/static/lms/js/build.js
@@ -66,6 +66,7 @@
             'jquery.url': 'empty:',
             'backbone': 'empty:',
             'underscore': 'empty:',
+            'underscore.string': 'empty:',
             'logger': 'empty:',
             'utility': 'empty:',
             'URI': 'empty:',
diff --git a/lms/static/lms/js/require-config.js b/lms/static/lms/js/require-config.js
index 2674176e7da1..144df4a6e0a7 100644
--- a/lms/static/lms/js/require-config.js
+++ b/lms/static/lms/js/require-config.js
@@ -18,7 +18,12 @@
             }
         };
         defineDependency("jQuery", "jquery");
-        defineDependency("_", "underscore");
+        defineDependency("s", "underscore.string");
+        // Underscore.string no longer installs itself directly on "_". For compatibility with existing
+        // code, add it to "_" with its previous name.
+        if (window._ && window.s) {
+            window._.str = window.s;
+        }
         defineDependency("gettext", "gettext");
         defineDependency("Logger", "logger");
         defineDependency("URI", "URI");
diff --git a/lms/templates/commerce/checkout_receipt.html b/lms/templates/commerce/checkout_receipt.html
index c07e21462c12..fe8a57f18078 100644
--- a/lms/templates/commerce/checkout_receipt.html
+++ b/lms/templates/commerce/checkout_receipt.html
@@ -19,7 +19,6 @@
 </%block>
 <%block name="js_extra">
 <script src="${static.url('js/vendor/jquery.ajax-retry.js')}"></script>
-<script src="${static.url('js/vendor/underscore.string.min.js')}"></script>
 <script src="${static.url('js/src/tooltip_manager.js')}"></script>
 <script src="${static.url('js/commerce/credit.js')}"></script>
 <script src="${static.url('js/commerce/views/receipt_view.js')}"></script>
diff --git a/lms/templates/help_modal.html b/lms/templates/help_modal.html
index 4b5f6b97f1d4..7c204327cf1f 100644
--- a/lms/templates/help_modal.html
+++ b/lms/templates/help_modal.html
@@ -254,13 +254,13 @@ <h2>${_('Thank You!')}</h2>
             htmlStr = "${_('An error has occurred.')}";
 % if settings.FEEDBACK_SUBMISSION_EMAIL:
             htmlStr += " " + _.template(
-              "${_('Please {link_start}send us e-mail{link_end}.')}",
-              {link_start: '<a href="#" id="feedback_email">', link_end: '</a>'},
-              {interpolate: /\{(.+?)\}/g})
+              "${_('Please {link_start}send us e-mail{link_end}.')}", {interpolate: /\{(.+?)\}/g})(
+                {link_start: '<a href="#" id="feedback_email">', link_end: '</a>'}
+              );
 % else:
             // If no email is configured, we can't do much other than
             // ask the user to try again later
-            htmlStr += "${_('Please try again later.')}";
+            htmlStr += " " + "${_('Please try again later.')}";
 % endif
             $("#feedback_error").html(htmlStr).stop().css("display", "block");
 % if settings.FEEDBACK_SUBMISSION_EMAIL:
diff --git a/lms/templates/verify_student/incourse_reverify.html b/lms/templates/verify_student/incourse_reverify.html
index 3c7be5e68a32..d107275575b7 100644
--- a/lms/templates/verify_student/incourse_reverify.html
+++ b/lms/templates/verify_student/incourse_reverify.html
@@ -18,7 +18,6 @@
     % endfor
 </%block>
 <%block name="js_extra">
-  <script src="${static.url('js/vendor/underscore.string.min.js')}"></script>
   <script src="${static.url('js/src/tooltip_manager.js')}"></script>
   <%static:js group='incourse_reverify'/>
 </%block>
diff --git a/lms/templates/verify_student/pay_and_verify.html b/lms/templates/verify_student/pay_and_verify.html
index 6c1882ff1d2f..0f862a682f09 100644
--- a/lms/templates/verify_student/pay_and_verify.html
+++ b/lms/templates/verify_student/pay_and_verify.html
@@ -41,7 +41,6 @@
     % endfor
 </%block>
 <%block name="js_extra">
-  <script src="${static.url('js/vendor/underscore.string.min.js')}"></script>
   <script src="${static.url('js/src/tooltip_manager.js')}"></script>
   <%static:js group='verify_student'/>
 </%block>
diff --git a/lms/templates/verify_student/reverify.html b/lms/templates/verify_student/reverify.html
index d3e6340115ca..6a0669849fe4 100644
--- a/lms/templates/verify_student/reverify.html
+++ b/lms/templates/verify_student/reverify.html
@@ -16,7 +16,6 @@
     % endfor
 </%block>
 <%block name="js_extra">
-  <script src="${static.url('js/vendor/underscore.string.min.js')}"></script>
   <script src="${static.url('js/src/tooltip_manager.js')}"></script>
   <%static:js group='reverify'/>
 </%block>
diff --git a/package.json b/package.json
index a2a4b58b3f14..2f6ecbe6ca06 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,8 @@
     "edx-pattern-library": "0.10.4",
     "requirejs": "~2.1.22",
     "uglify-js": "2.4.24",
-    "underscore": "1.4.4"
+    "underscore": "~1.8.3",
+    "underscore.string": "~3.3.4"
   },
   "devDependencies": {
     "jshint": "^2.7.0",