Build only branches that are ready
Merge branch 'master' into 3.6