Merge branch '0.11.0'
mysql 5.5