options-1.2 has propagated.
Merge remote-tracking branch 'origin/jruby-1_7'

Conflicts:
	core/pom.xml