Little bit of cleanup to keep jslint happy
Merge remote-tracking branch 'origin/master'