Allow descriptions with embedded newlines to format cleanly

This replaces my similar previous pull request.  Now with a test!