Please find patch attached.

Some notes about the patch:
Another note:  Should some document mention that trailing whitespace are not allowed in the git repo?  I couldn't find that anywhere.