Fix tristate's extra newline.  -MK
Merge remote-tracking branch 'origin/master'