Merge branch 'stable'
Fix Comment
Add mysql-client installation
Merge branch 'master' into stable