diff --git a/ChangeLog b/ChangeLog
index 8b1269dace..87c2e3b546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,7 @@ phpMyAdmin - ChangeLog
 - bug #4564 Designer: spaces in table name with edit table link generates bad links
 - bug #4582 Debug SQL works only for the first page
 - bug #3869 Count(*) on information_scheme.INNODB_BUFFER_PAGE with a huge bufferpool
+- bug #4495 Comment lines in multiquery
 
 4.2.12.0 (not yet released)
 - bug #4574 Blank/white page when JavaScript disabled
diff --git a/libraries/plugins/import/ImportSql.class.php b/libraries/plugins/import/ImportSql.class.php
index fcabd04816..d0b7bc46d9 100644
--- a/libraries/plugins/import/ImportSql.class.php
+++ b/libraries/plugins/import/ImportSql.class.php
@@ -296,6 +296,11 @@ class ImportSql extends ImportPlugin
                     //throw new Exception('Unknown case.');
                     break;
                 }
+
+                if (0 === $this->_firstSearchChar) {
+                    $this->_queryBeginPosition = $this->_delimiterPosition;
+                }
+
                 continue;
             }
 
diff --git a/libraries/tracking.lib.php b/libraries/tracking.lib.php
index fae0d81515..f809e8f803 100644
--- a/libraries/tracking.lib.php
+++ b/libraries/tracking.lib.php
@@ -698,7 +698,7 @@ function PMA_getHtmlForOneStatement($entry, $filter_users,
  * @param array  $url_params         url parameters
  * @param string $drop_image_or_text drop image or text
  *
- * @return array 
+ * @return array
  */
 function PMA_getHtmlForDataDefinitionStatements($data, $filter_users,
     $filter_ts_from, $filter_ts_to, $url_params, $drop_image_or_text