Merge tag '3.0.2' into develop

Released v3.0.2:

- composer.json fixes
Merge branch 'release/4.0.0'