Merge branch 'master' of https://github.com/medaved/packages
Merge branch 'master' of https://github.com/medaved/packages

* 'master' of https://github.com/medaved/packages: