diff --git a/core/Requirements.php b/core/Requirements.php
index f1ff65c85..73c09fa16 100644
--- a/core/Requirements.php
+++ b/core/Requirements.php
@@ -7,6 +7,20 @@
  * @subpackage view
  */
 class Requirements {
+	/**
+	 * Enable combining of css/javascript files.
+	 *
+	 * @var boolean
+	 */
+	private static $combined_files_enabled = true;
+	public static function set_combined_files_enabled($enable) {
+		self::$combined_files_enabled = (bool) $enable;
+	}
+	
+	public static function get_combined_files_enabled() {
+		return self::$combined_files_enabled;
+	}
+
 	/**
 	 * Instance of requirements for storage
 	 *
@@ -779,7 +793,7 @@ class Requirements_Backend {
 	 */
 	function process_combined_files() {
 	
-		if(Director::isDev() && !SapphireTest::is_running_test()) {
+		if(Director::isDev() && !SapphireTest::is_running_test() && Requirements::get_combined_files_enabled()) {
 			return;
 		}
 		
@@ -920,4 +934,4 @@ class Requirements_Backend {
 	
 }
 
-?>
\ No newline at end of file
+?>