Merge origin/master into julio

Conflicts:
	henry.php

tambien subi mi cambio