[b3] commit
Merge remote-tracking branch 'origin/b3'

Conflicts:
	README.rdoc