Merge branch 'master' of https://github.com/di2e/openstorefront
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #360 from Jedwondle/master

Merge branch 'master' of https://github.com/di2e/openstorefront