Merging changes into master

* Mysql
* Psql
* Modules