javascript more
Merge branch 'master' into stats