compiled javascript, no dependency on coffeescript
Merge branch 'master' into latest