Merge branch 'master' of https://github.com/mkehlmann/javascript
Merge branch 'master' of https://github.com/mkehlmann/javascript