Fixes #136
Merge branch '2digit_product_code_url_fix' into beta