Works with Rails 4
Merge branch 'rails4'
Bump version for Rails 4