conflict2
Merge branch 'develop' into pr_test2

Conflicts:
	README.rdoc