Merge branch 'master' of github.com:Indatus/maria-db

Conflicts:
	attributes/default.rb