Fix for git's "handling" of line-endings on different platforms.
Merge branch 'master' into next
Merge remote-tracking branch 'origin/next' into api