Fix jslint errors
Merge remote branch 'upstream/master'