Index: package.json
===================================================================
--- package.json	(revision 25011)
+++ package.json	(working copy)
@@ -3,17 +3,18 @@
   "version": "3.7.0",
   "description": "WordPress is web software you can use to create a beautiful website or blog.",
   "repository": {
-    "type": "svn",
-    "url": "https://develop.svn.wordpress.org/trunk"
+	"type": "svn",
+	"url": "https://develop.svn.wordpress.org/trunk"
   },
   "author": "The WordPress Contributors",
   "license": "GPLv2 or later",
   "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-contrib-clean": "~0.5.0",
-    "grunt-contrib-copy": "~0.4.1",
-    "grunt-contrib-cssmin": "~0.6.1",
-    "grunt-contrib-uglify": "~0.2.2",
-    "grunt-contrib-watch": "~0.5.1"
+	"grunt": "~0.4.1",
+	"matchdep": "~0.1.2",
+	"grunt-contrib-clean": "~0.5.0",
+	"grunt-contrib-copy": "~0.4.1",
+	"grunt-contrib-cssmin": "~0.6.1",
+	"grunt-contrib-uglify": "~0.2.2",
+	"grunt-contrib-watch": "~0.5.1"
   }
 }
Index: Gruntfile.js
===================================================================
--- Gruntfile.js	(revision 25011)
+++ Gruntfile.js	(working copy)
@@ -4,6 +4,10 @@
 	var SOURCE_DIR = 'src/';
 	var BUILD_DIR = 'build/';
 
+	// Load tasks.
+	require('matchdep').filterDev('grunt-*').forEach( grunt.loadNpmTasks );
+
+	
 	// Project configuration.
 	grunt.initConfig({
 		clean: {
@@ -106,12 +110,6 @@
 		}
 	});
 
-	// Load tasks.
-	grunt.loadNpmTasks('grunt-contrib-clean');
-	grunt.loadNpmTasks('grunt-contrib-copy');
-	grunt.loadNpmTasks('grunt-contrib-cssmin');
-	grunt.loadNpmTasks('grunt-contrib-uglify');
-	grunt.loadNpmTasks('grunt-contrib-watch');
 
 	// Register tasks.
 	grunt.registerTask('build', ['clean:all', 'copy:all', 'cssmin:core',