Revert "Revert "Merge remote-tracking branch 'upstream/master' into bubb...

...le-tea""

This reverts commit a76dc9b333ef8b24e0ea20e50116abb1914ab285.