Merge remote-tracking branch 'upstream/master'

Conflicts:
	templates/default/my.cnf.erb