oops, bugger, fix js path
Merge branch 'refs/heads/master' into 2.3