Merge branch 'master' into pentool

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

1 files changed, 2 insertions, 2 deletions

diff --git a/node_modules/montage/core/event/action-event-listener.js b/node_modules/montage/core/event/action-event-listener.js
index bbe5baad..4fc75f64 100755
--- a/node_modules/montage/core/event/action-event-listener.js
+++ b/node_modules/montage/core/event/action-event-listener.js
@@ -66,9 +66,9 @@ var ActionEventListener = exports.ActionEventListener = Montage.create(Montage,
 /**
     @private
 */
-    serializeSelf: {
+    serializeProperties: {
         value: function(serializer) {
-            serializer.setReference("handler", this.handler);
+            serializer.set("handler", this.handler, "reference");
             serializer.set("action", this.action);
         }
     }