Set specific rbx since generic is no longer present
Merge branch 'master' into rails41

Conflicts:
	.travis.yml