dat comma
Correct test
Fix newfound lint errors
Merge remote-tracking branch 'upstream/master'