Merge changes to wp-e-commerce.js