Limiting empty new lines to at most one.
Merge branch 'master' into unordered_map