Merge branch 'D1572' of github.com:loadedcommerce/loaded7 into D1572