Merge pull request #1322 from SpecLad:terse