Merge changes from 8331d0267a5fe6811a09ad7bd9cf3a262c5a8cfa
Merge branch 'master' of github.com:wp-e-commerce/WP-e-Commerce