What will this do?
Merge branch 'dev'

Conflicts:
	README.rdoc