Merge with master
Add Mysql connector
merge with master
fix merge