[v8/el6: 4/4] Merge branch 'master' into el6