Merge branches 'fully-qualify-rails' and 'shared-comparator' into mongoid-support