Sync'ing global.php with stable to fix multi-session merges, and also