Pass JSHint validation
Merge branch 'jshint' into QA_2_4