Per Roans request, Merge in r65475 (Database.php only) from querypage-work2 branch