Updates and bug fixes for R3.6RC3 and ZenCart 1.5.1