Prefer testing line[0] != '\0' over calling strlen()
Merge remote-tracking branch 'upstream/master'