Merge branch 'master' into try-merge
Fix upstream merge.