Add the right indentation for javascript
Merge remote-tracking branch 'gh/master'