Merge branch 'master' into develop

# Conflicts:
#	template/build/webpack.base.conf.js
#	template/build/webpack.test.conf.js

Author: LinusBorg

template/build/webpack.test.conf.js

@@ -4,9 +4,9 @@
 const utils = require('./utils')
 const webpack = require('webpack')
 const merge = require('webpack-merge')
-const baseConfig = require('./webpack.base.conf')
+const baseWebpackConfig = require('./webpack.base.conf')
 
-const webpackConfig = merge(baseConfig, {
+const webpackConfig = merge(baseWebpackConfig, {
   // use inline sourcemap for karma-sourcemap-loader
   module: {
     rules: utils.styleLoaders()