Merge branch 'master' into stable
Remove currency helper from new price facet
Remove "$" and currency helper from old calls
Revert to older check for price per glass/bottle