Merge branch 'master' into js-test