Merge pull request #3045 from Diapolo/master

misc small spelling/indentation fixes