whitespace
Another pass over the wording.
Merge branch 'develop' into overflow-relax