Fix line-endings in master too so I can switch branches.