Scripts

Fixed trailing whitespace and backport commit from master.