Merge branch '5.7.x' into 5.8.x

git/hooks/prepare-forward-merge

@@ -4,7 +4,7 @@ require 'net/http'
 require 'yaml'
 require 'logger'
 
-$main_branch = "3.0.x"
+$main_branch = "6.0.x"
 
 $log = Logger.new(STDOUT)
 $log.level = Logger::WARN