Fixed jsHint warning.
Merge branch 'master' into dev-stable