Merge from trunk

diff --cc src/errorpage.cc
index e057a1313f104ea05dbaede09897d55298ee2142,ebfd5966e095dd26e0cc486a700b25f0e019b1b2..26306124059a3a6731d4cba5f742cb0f01e15041
--- 1/src/errorpage.cc
--- 2/src/errorpage.cc
+++ b/src/errorpage.cc
@@@ -975,11 -938,7 +975,11 @@@ ErrorState::BuildContent(
       */
      if(!m) {
          m = error_text[page_id];
-         debugs(4, 1, HERE << "No existing languages found. Fall back on default language.");
 +#if USE_ERR_LOCALES
 +        if(!Config.errorDirectory)
 +            err_language = Config.errorDefaultLanguage;
 +#endif
+         debugs(4, 2, HERE << "No existing error page language negotiated for " << page_id << ". Using default error file.");
      }
  
      assert(m);