Merge branch 'master' of github.com:elastic/kibana into chore/upgradeEsjs

package.json

@@ -62,8 +62,8 @@
     "angular-elastic": "2.5.0",
     "angular-route": "1.2.28",
     "ansicolors": "^0.3.2",
-    "autoprefixer": "^5.2.0",
-    "autoprefixer-loader": "^2.0.0",
+    "autoprefixer": "5.1.x",
+    "autoprefixer-loader": "2.0.x",
     "babel": "^5.8.21",
     "babel-core": "^5.8.22",
     "babel-loader": "^5.3.2",

src/optimize/BaseOptimizer.js

@@ -78,6 +78,8 @@ class BaseOptimizer {
         devtoolModuleFilenameTemplate: '[absolute-resource-path]'
       },
 
+      recordsPath: resolve(this.env.workingDir, 'webpack.records'),
+
       plugins: [
         new webpack.ResolverPlugin([
           new DirectoryNameAsMain()

tasks/config/esvm.js

@@ -6,7 +6,7 @@ module.exports = function (grunt) {
   return {
     options: {
       directory: directory,
-      branch: 'master',
+      branch: '2.0',
       fresh: !grunt.option('esvm-no-fresh'),
       config: {
         path: {