revert to c3da4971f7dbf7aefe894c4e50ab831be228f7a3
Merge branch '2716_json_alias' of github.com:500px/mongoid into 2716_json_alias