Recalculate option values on variants when product variant unit is changed
Merge branch 'master' into units