Merge branch '1.8' after 1.8.2 release

Conflicts:
	version.php

diff --cc engine/classes/ElggSite.php
index 0d03cbd287ca8177f86502596a62459a6e5eb4ec,3ccb146fb0ed57cec181eb1adb08ee7e66371034..2d6238a198f875d71149729a6d95ca9f75655073
--- 1/engine/classes/ElggSite.php
--- 2/engine/classes/ElggSite.php
+++ b/engine/classes/ElggSite.php
@@@ -421,8 -421,12 +421,10 @@@ class ElggSite extends ElggEntity 
                        'action/security/refreshtoken',
                        'ajax/view/js/languages',
                        'upgrade\.php',
 -                      'xml-rpc\.php',
 -                      'mt/mt-xmlrpc\.cgi',
                        'css/.*',
-                       'js/.*'
+                       'js/.*',
+                       'cache/css/.*',
+                       'cache/js/.*',
                );
  
                // include a hook for plugin authors to include public pages

diff --cc languages/en.php
Simple merge