Fix JS syntax errors
Merge branch 'master' into tile-config