Fix mysql51 feature
Merge branch 'fix/mysql51-feature' into staging/master