Fixes #12691 - Small Rails 4 backwards compatible changes
Following on 10409, rebasing the Rails 4 PR with develop has needed somechanges that can be backported to develop now.
Fixes #12691 - Small Rails 4 backwards compatible changes
Following on 10409, rebasing the Rails 4 PR with develop has needed some
changes that can be backported to develop now.