Fixes for v1.4.0

Testing needed. Does line ending changes break something?

Tested with gradlew.bat, cygwin + gradlew and linux + gradlew: All working ok.