Merge remote-tracking branch 'remotes/origin/BI4.1'

# Conflicts:
#	dist/bundle.min.js

dist/fix/fix.compact.js

@@ -15,7 +15,7 @@
 
     function createWatcher(vm, keyOrFn, handler) {
         return Fix.watch(vm.model, keyOrFn, _.bind(handler, vm), {
-            store: vm
+            store: vm.store
         })
     }