Fix incorrect wrapping when pasting, etc.
Fix tabs so they aren't represented by spaces.
Merge branch 'release_30' into release_31

Fix incorrect wrapping when pasting, etc.
Merge branch 'release_30' into release_31

Fix tabs so they aren't represented by spaces.