even in a multi-threaded env, the custom klass should be loaded
Merge remote-tracking branch 'upstream/master' into mongoid-3

Conflicts:
	Gemfile.lock
	lib/custom_fields/version.rb