Merge master
Merge branch 'upstream-merge'