Merge remote-tracking branch 'origin/master'

Conflicts:
	app/etc/local.xml