for mysql 5.5
Merge remote-tracking branch 'origin/master' into Branching/Beta