Merge remote-tracking branch 'upstream/stable' into stable