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

Trying to merge into Master.