Merge pull request #1821 from iainx/replace-getline