pulled from remote master; line ending issues