Fix 293
Merge branch '1.2.0b' of github.com:abantecart/abantecart-src into 1.2.0b