bencode
diff --git a/‎src/compiler/compile-props.js
Lines changed: 4 additions & 3 deletions b/‎src/compiler/compile-props.js
Lines changed: 4 additions & 3 deletions
diff --git a/‎test/unit/specs/directives/prop_spec.js
Lines changed: 10 additions & 0 deletions b/‎test/unit/specs/directives/prop_spec.js
Lines changed: 10 additions & 0 deletions
@@ -181,7 +181,7 @@ function makePropsLinkFn (props) {
       options = prop.options
       if (prop.raw === null) {
         // initialize absent prop
-        _.initProp(vm, prop, getDefault(options))
+        _.initProp(vm, prop, getDefault(vm, options))
       } else if (prop.dynamic) {
         // dynamic prop
         if (vm._context) {
@@ -224,11 +224,12 @@ function makePropsLinkFn (props) {
 /**
  * Get the default value of a prop.
  *
+ * @param {Vue} vm
  * @param {Object} options
  * @return {*}
  */
 
-function getDefault (options) {
+function getDefault (vm, options) {
   // no default, return undefined
   if (!options.hasOwnProperty('default')) {
     // absent boolean value defaults to false
@@ -247,6 +248,6 @@ function getDefault (options) {
   }
   // call factory function for non-Function types
   return typeof def === 'function' && options.type !== Function
-    ? def()
+    ? def.call(vm)
     : def
 }
@@ -579,6 +579,12 @@ if (_.inBrowser) {
               prop: {
                 type: String,
                 default: 'hello'
+              },
+              prop2: {
+                type: Object,
+                default: function () {
+                  return { vm: this }
+                }
               }
             },
             data: function () {
@@ -591,6 +597,10 @@ if (_.inBrowser) {
         }
       })
       expect(vm.$el.textContent).toBe('hello world')
+      // object/array default value initializers should be
+      // called with the correct `this` context
+      var child = vm.$children[0]
+      expect(child.prop2.vm).toBe(child)
       vm.$children[0].prop = 'bye'
       _.nextTick(function () {
         expect(vm.$el.textContent).toBe('bye world')