Merge branch 'master' into develop

rewrite.php

@@ -10,8 +10,9 @@ while ($line = fgets($stdin)) {
   $line = trim($line, "\n");
   
   // Check for this result in the cache
-  if (!($output = $cache->get($line))) {
+  if (!($route = $cache->get($line))) {
 
+    $output = array();
     exec('/usr/bin/php ' . __DIR__ . '/rewrite_miss.php ' . escapeshellarg($line), $output, $return_var);
 
     // Set default route
@@ -61,4 +62,4 @@ class RewriteCache {
     }
     $this->_storage[$key] = array('time' => time(), 'data' => $value);
   }
-}
\ No newline at end of file
+}