language feature
fix comma
Merge upstream

Conflicts:
	attributes/default.rb
	recipes/default.rb
	templates/default/wp-config.php.erb
show grant query use db[user]