Merge "Fix issues spotted by jshint 2.9.0"