diff --git a/installation/CHANGELOG b/installation/CHANGELOG
index d46e3488a65a5..d3cf4f72eeccf 100644
--- a/installation/CHANGELOG
+++ b/installation/CHANGELOG
@@ -27,6 +27,9 @@ $ -> Language fix or change
 
 ; Below is merged into v3.1.2
 
+21-Jul-2013 Michael Babker
+ # [#31401] Fixed issue with $query object being overwritten by string.  Thanks Peter van Westen
+
 21-Jul-2013 Jean-Marie Simonet
  + [#31349] Display Error Message when Magic Quotes is Enabled. Thanks Brian Teeman
  #+ [#31488] Add Observer pattern to JTable (and use it for Tags implementation (which also fixes [#31339] too). Thanks Beat.
diff --git a/libraries/cms/installer/installer.php b/libraries/cms/installer/installer.php
index 69f490a8f2ce9..3eed9f090171a 100644
--- a/libraries/cms/installer/installer.php
+++ b/libraries/cms/installer/installer.php
@@ -1101,13 +1101,13 @@ public function parseSchemaUpdates(SimpleXMLElement $schema, $eid)
 								}
 
 								// Process each query in the $queries array (split out of sql file).
-								foreach ($queries as $query)
+								foreach ($queries as $q)
 								{
-									$query = trim($query);
+									$q = trim($q);
 
-									if ($query != '' && $query{0} != '#')
+									if ($q != '' && $q{0} != '#')
 									{
-										$db->setQuery($query);
+										$db->setQuery($q);
 
 										if (!$db->execute())
 										{