argh, end of lines.
Still working on line ending craziness. @jread-usgs @rbatt See if this is a more general solution.
Merge remote-tracking branch 'upstream/master'