Merge Rails 4 parameter conversion fix

fixes params conversion error on Rails 4