Merge latest trunk change for a database fix.