Fixed line endings to be the same as in Cimbalino/master