Trying potential fix for #1355
Merge branch 'rc3' of git@github.com:ten24/Slatwall.git into rc3