newaliases / makemap should parse multi-line aliases entries
Merge branch 'master' into portable