Merge "Run populateContentTables.php from update.php"