jshinting, Caroline, jshinting.
Merge remote-tracking branch 'origin/master'