Version bump.
Merge branch 'zipsafe'