Merge from official MySQL connector v1.2.2