Reapply changes from 891b6b7
Bump version