Fixed MySQL strict_mode issues
Merge branch '6.2' into 6.3