potential fix for jshint
Merge branch 'master' into develop