Merge branch 'release/7.0.2' into devel
much better submitting all around. nice.
Merge branch 'release/7.0.3'