Merge branch 'master' into css-source-maps

Conflicts:
	Gruntfile.js

diff --cc Gruntfile.js
index efe5918fb110f9bb0c6176000bc0a32d4ae9c40d,5ba8abbfb95f690c407e3d2828493ac979b0bfab..ab4b56cd26548294266e0fa7cc6f6bbeaedadbe2
--- 1/Gruntfile.js
--- 2/Gruntfile.js
+++ b/Gruntfile.js
@@@ -111,25 -113,12 +113,27 @@@ module.exports = function (grunt) 
      },
  
      less: {
 -      compile: {
 +      compileCore: {
          options: {
 -          strictMath: true
++          strictMath: true,
 +          sourceMap: true,
 +          outputSourceFiles: true,
 +          sourceMapURL: '<%= pkg.name %>.css.map',
 +          sourceMapFilename: 'dist/css/<%= pkg.name %>.css.map'
 +        },
 +        files: {
 +          'dist/css/<%= pkg.name %>.css': 'less/bootstrap.less'
 +        }
 +      },
 +      compileTheme: {
 +        options: {
++          strictMath: true,
 +          sourceMap: true,
 +          outputSourceFiles: true,
 +          sourceMapURL: '<%= pkg.name %>-theme.css.map',
 +          sourceMapFilename: 'dist/css/<%= pkg.name %>-theme.css.map'
          },
          files: {
 -          'dist/css/<%= pkg.name %>.css': 'less/bootstrap.less',
            'dist/css/<%= pkg.name %>-theme.css': 'less/theme.less'
          }
        },

diff --cc dist/css/bootstrap.css
Simple merge