integrating the latest montage fixes for v0.6 into master

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/node_modules/montage/data/context.js b/node_modules/montage/data/context.js
index 694198e3..ca992ff0 100755
--- a/node_modules/montage/data/context.js
+++ b/node_modules/montage/data/context.js
@@ -148,10 +148,11 @@ var Context = exports.Context = Montage.create(Store, /** @lends module:montage/
                 if (instance.context === null) {
                     instance.context = this;
                     this._inserted.add(instance);
+                    var self = this;
                     return this.initializeObject(instance, this).then(function(instance) {
-                        this._objectMap.set(instance.objectId, instance);
+                        self._objectMap.set(instance.objectId, instance);
                         return Promise.ref(instance);
-                    }.bind(this));
+                    });
                 } else if (instance.context !== this) {
                     throw Exception.initWithMessageTargetAndMethod("This instance is already inserted in another context.", this, "insert");
                 }