Merge pull request #6668 from s0undt3ch/develop

Remove trailing white-space.
Flush print messages.