Add new test and patch preserve_block, which was broken by earlier fix. Introduces a new option for preserving multiple lines, as these two cases were muddled
Merge pull request #1351 from vohi/master

Add new test and patch preserve_block, which was broken by earlier fix.