Merge proposals dependent on lp://qastaging/~kobuge/godot/trunk

lp://qastaging/~kobuge/godot/trunk has no merge proposals.