Merge pull request #1285 from mcnewton/debtidy