Fix support for RVM mixed mode installations (issue #828).

Conflicts:
	NEWS