Merge branch 'product-variation-branch'
Merge branch 'master' of https://github.com/mattshanks/wp-theme-2015