leonerd Merge pull request #104 from jkeenan/trail-whitespace-20200409