Merge remote-tracking branch 'upstream/master' into jsinit
Merge branch 'master' into jsinit