Fix line endings for Windows.

Closes #308.
Merge remote-tracking branch 'upstream/master'