From a12e39a15499faccf5a09b2daf61fd233373289d Mon Sep 17 00:00:00 2001
From: Aron Fyodor Asor <aronasorman@users.noreply.github.com>
Date: Mon, 17 Aug 2015 15:13:56 -0700
Subject: [PATCH 1/2] Add placeholder mac installer link.

---
 docs/installguide/install_all.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/installguide/install_all.rst b/docs/installguide/install_all.rst
index 68b6b4e747..65feb391dc 100644
--- a/docs/installguide/install_all.rst
+++ b/docs/installguide/install_all.rst
@@ -7,9 +7,8 @@ Windows Installation
 Mac Installation
 ================
 
-1. Download the KA Lite `OSX installer <https://disney.com>`_.
-
-.. warning:: Dear maintainers, please update this link.
+1. Download the KA Lite `OSX installer <https://learningequality.org/downloads/ka-lite/0.14/installers/mac/KA-Lite-Monitor.dmg>`_.
+2. After the download is complete, double click the .dmg file and follow the window for installation.
 
 Linux: Debian/Ubuntu Installation
 =================================

From 41923fc36386278b19e1ce5cfe77ea8f5e942e97 Mon Sep 17 00:00:00 2001
From: Jamie Alexandre <jamalex@gmail.com>
Date: Mon, 17 Aug 2015 20:48:35 -0700
Subject: [PATCH 2/2] Safer BaseView.remove: remove el before reflow, no
 infinite recursion.

---
 .../backbone/static/js/backbone/backbone-helpers.js    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/python-packages/fle_utils/backbone/static/js/backbone/backbone-helpers.js b/python-packages/fle_utils/backbone/static/js/backbone/backbone-helpers.js
index e9243dd1c9..83741d783a 100644
--- a/python-packages/fle_utils/backbone/static/js/backbone/backbone-helpers.js
+++ b/python-packages/fle_utils/backbone/static/js/backbone/backbone-helpers.js
@@ -124,6 +124,15 @@ window.BaseView = Backbone.View.extend({
     },
 
     remove: function() {
+
+        // make sure we never end up removing the same view twice, in case there's weird circularity
+        if (this._removed) return;
+        this._removed = true;
+
+        // remove this view using the default Backbone code, which removes the DOM element
+        Backbone.View.prototype.remove.call(this);
+
+        // recursively remove this view's subviews, to avoid detached views with zombie listeners
         if (this.subviews!==undefined) {
             for (i=0; i < this.subviews.length; i++) {
                 if (_.isFunction(this.subviews[i].close)) {
@@ -133,6 +142,5 @@ window.BaseView = Backbone.View.extend({
                 }
             }
         }
-        Backbone.View.prototype.remove.call(this);
     }
 });