Merge from official MySQL connector v1.1.7