Merge remote-tracking branch 'origin/master' into Canvis

Conflicts:
	holacarallot.txt
no message
Merge commit 'ed089e6cac81e01abe3a3bed68e107401ae6196f'

Conflicts:
	holacarallot.txt