Merge branch 'master' into pentool

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

1 files changed, 11 insertions, 1 deletions

diff --git a/node_modules/montage/core/undo-manager.js b/node_modules/montage/core/undo-manager.js
index cd97ee59..7335df77 100644
--- a/node_modules/montage/core/undo-manager.js
+++ b/node_modules/montage/core/undo-manager.js
@@ -8,7 +8,7 @@
 
 var Montage = require("montage").Montage;
 
-exports.UndoManager = Montage.create(Montage, {
+var UndoManager = exports.UndoManager = Montage.create(Montage, {
 
     enabled: {
         value: true
@@ -238,3 +238,13 @@ exports.UndoManager = Montage.create(Montage, {
     }
 
 });
+
+var _defaultUndoManager = null;
+Montage.defineProperty(exports, "defaultUndoManager", {
+    get: function() {
+        if (!_defaultUndoManager) {
+            _defaultUndoManager = UndoManager.create();
+        }
+        return _defaultUndoManager;
+    }
+});