5.0 dev version bump
Merge changelog from 3.5
Update changelog