diff --git a/ChangeLog b/ChangeLog
index ba203a65c1..505b62b2c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 phpMyAdmin - ChangeLog
 ======================
 
+4.5.5.1 (not yet released)
+- issue #11971 CREATE UNIQUE INDEX index type is not recognized by parser.
+- issue #11982 Row count wrong when grouping joined tables.
+- issue #12012 Column definition with default value and comment in CREATE TABLE expoerted faulty.
+- issue #12020 New statement but no delimiter and unexpected token with REPLACE.
+- issue #12029 Fixed incorrect usage of SQL parser context in SQL export
+
 4.5.5.0 (2016-02-22)
 - issue        Undefined index: is_ajax_request
 - issue #11855 Fix password change on MariaDB 10.1 and newer
@@ -70,15 +77,15 @@ phpMyAdmin - ChangeLog
 - issue #11854 Undefined property: stdClass::$releases at version check when disabled in config
 - issue #11814 SQL comment and variable stripped from bookmark on save
 - issue        Gracefully handle errors in regex based javascript search
-- issue        [Security] Multiple full path disclosure vulnerabilities, see PMASA-2016-1
-- issue        [Security] Unsafe generation of CSRF token, see PMASA-2016-2
-- issue        [Security] Multiple XSS vulnerabilities, see PMASA-2016-3
-- issue        [Security] Insecure password generation in JavaScript, see PMASA-2016-4
-- issue        [Security] Unsafe comparison of CSRF token, see PMASA-2016-5
-- issue        [Security] Multiple full path disclosure vulnerabilities, see PMASA-2016-6
-- issue        [Security] XSS vulnerability in normalization page, see PMASA-2016-7
-- issue        [Security] Full path disclosure vulnerability in SQL parser, see PMASA-2016-8
-- issue        [Security] XSS vulnerability in SQL editor, see PMASA-2016-9
+- issue        [security] Multiple full path disclosure vulnerabilities, see PMASA-2016-1
+- issue        [security] Unsafe generation of CSRF token, see PMASA-2016-2
+- issue        [security] Multiple XSS vulnerabilities, see PMASA-2016-3
+- issue        [security] Insecure password generation in JavaScript, see PMASA-2016-4
+- issue        [security] Unsafe comparison of CSRF token, see PMASA-2016-5
+- issue        [security] Multiple full path disclosure vulnerabilities, see PMASA-2016-6
+- issue        [security] XSS vulnerability in normalization page, see PMASA-2016-7
+- issue        [security] Full path disclosure vulnerability in SQL parser, see PMASA-2016-8
+- issue        [security] XSS vulnerability in SQL editor, see PMASA-2016-9
 
          --- Older ChangeLogs can be found on our project website ---
                      http://www.phpmyadmin.net/old-stuff/ChangeLogs/
diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php
index 715ad48f92..552a64fe51 100644
--- a/libraries/plugins/export/ExportSql.class.php
+++ b/libraries/plugins/export/ExportSql.class.php
@@ -1554,7 +1554,7 @@ class ExportSql extends ExportPlugin
                 if (empty($sql_backquotes)) {
                     // Option "Enclose table and column names with backquotes"
                     // was checked.
-                    Context::$MODE |= Context::NO_ENCLOSING_QUOTES;
+                    SqlParser\Context::$MODE |= SqlParser\Context::NO_ENCLOSING_QUOTES;
                 }
 
                 // Using appropriate quotes.