Merge branch 'master' of https://github.com/maxrice/woocommerce
Merge branch 'master' of https://github.com/woothemes/woocommerce