Merge branch 'issue830' into 1.7.x
update jruby version to 1.7.10
Merge branch 'issue841' into 2.0.x