fix sql error
XMerge branch '4.2-maint' of https://github.com/k-int/KBPlus into 4.2-maint
Merge branch '4.2-maint' of https://github.com/k-int/KBPlus into 4.2-maint