Update RF tests
Merge branch 'master' into plone-4.1

Conflicts:
	setup.py