pmr2.ricordo-0.1
Merge branch 'master' into 0.1.x

Conflicts:
	CHANGES.txt