Merge branch 'master' into pentool

Conflicts:
	js/helper-classes/3D/view-utils.js

1 files changed, 1 insertions, 1 deletions

diff --git a/node_modules/montage/ui/condition.reel/condition.js b/node_modules/montage/ui/condition.reel/condition.js
index 064f51b7..bcb0e957 100755
--- a/node_modules/montage/ui/condition.reel/condition.js
+++ b/node_modules/montage/ui/condition.reel/condition.js
@@ -148,7 +148,7 @@ exports.Condition = Montage.create(Component, /** @lends module:"montage/ui/cond
                 this.content = document.createElement("div");
                 childList = Array.prototype.slice.call(this._element.childNodes, 0);
                 for (i = 0; (childElement = childList[i]); i++) {
-                    childElement.parentElement.removeChild(childElement);
+                    childElement.parentNode.removeChild(childElement);
                     this.content.appendChild(childElement);
                 }
             }