Merge remote branch 'origin/master'

sql.php

@@ -391,11 +391,6 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
              */
             require './' . PMA_securePath($goto);
         } else {
-            /**
-             * HTML header.
-             */
-
-            require_once './libraries/header.inc.php';
             $full_err_url = (preg_match('@^(db|tbl)_@', $err_url))
                           ? $err_url . '&show_query=1&sql_query=' . urlencode($sql_query)
                           : $err_url;

tbl_replace.php

@@ -325,7 +325,9 @@ if ($is_insert && count($value_sets) > 0) {
     // No change -> move back to the calling script
     $message = PMA_Message::success(__('No change'));
     $active_page = $goto_include;
+    if(!$GLOBALS['is_ajax_request'] == true) {
         require_once './libraries/header.inc.php';
+    }
     require './' . PMA_securePath($goto_include);
     exit;
 }