Merge "Make the global objects documentation consistent in Setup.php"