Imported upstream 6163:6ff8e0d745af
Merge branch 'master' into merge-upstream