ref #4028 - jsHint corrections
Merge remote-tracking branch 'origin/master'