Merge "Change getline to not count the null terminator"