Wrap 80 characters [skip ci]
Update change log [skip ci]
Use newer Ruby hash syntax [skip ci]
Remove extra space [skip ci]
Patch Rails commit c1a118a

Fixes #461.

It would be preferable to find a better way to solve this.
Merge branch 'master' into mongoid

* master:
  Patch Rails commit c1a118a
  Remove extra space [skip ci]
  Use newer Ruby hash syntax [skip ci]
  Update change log [skip ci]
  Wrap 80 characters [skip ci]