Allow non-websafe SKU's for sku_count
Merge branch 'qa'