Added mysql alias
Merge branch 'master' into unix