Merge pull request #458 from Jedwondle/v1.2

Merging 1.1 into 1.2 to keep up with changes.
Merge branch 'v1.2' of https://github.com/di2e/openstorefront into v1.2