Merge "Use String#lines() rather than String#split()"