Assorted cherry-picks from the master branch for Godot 3.1.2 [3rd batch]
Created by: akien-mga
Plenty more candidate for cherry-picking in the cherrypick:3.1
label, here's a batch of recent commits that I reviewed today.
I'll make a 3.1.2 RC1 build with those in coming days.