Added in changes from VELUXShop
Merge branch 'develop'