Update new stubs
Update with our new stubs
Merge remote-tracking branch 'upstream/master'