Merge branch 'hotfix/3.0.1' into devel
Merge branch 'master' into devel
Pushing to the web.
Merge branch 'release/3.0.2'