Update README.rdoc
Merge remote-tracking branch 'origin/master' into feature-1

Conflicts:
	README.rdoc