Merge branch 'release/7.0.1' into devel
wording tweak
even better wordz
Merge branch 'release/7.0.2'