jRuby support
Merge branch 'master' into add_more_fields_to_credit_cards

* master:
  jRuby support