Version upped.
Merge branch 'release/3.0' into develop