No more trailing whitespace
Merge branch 'whitespace-fix' into HPC