Bump to version 3.0.5
Update changelog
Merge branch 'release-3.0.5' into develop