Updated history
Release 3.0.0
Merge branch 'master' into develop