version bump
Merge branch 'eden'