version bump
Merge branch 'release/1.05' into develop