Rails 4.2 ref: #37

@l15n please review