Merge origin/patch-1 Alvaro Crego

Conflicts:
	Database