Merge pull request #3479 from jdlferreira/develop

var_export in DB.php outputting string