Merge mongoid fork