Merge branch 'erp5-component' into erp5-component-z2.13

Conflicts:
	stack/erp5/buildout.cfg