Cleaning some extraneous whitespace
Merge branch 'bugfix/trailing-whitespace-cleanup'