underline support and test coverage for underline
Merge remote-tracking branch 'remotes/JohnMcLear/underline' into underline
Ignore underline by default