Merge pull request #392 from apache/RemoveExtraEmptyLines