Last commits broke 2.x compatibility?

[singalen]

On the latest master, when logging in with Google, I get:

ActiveRecord::ConfigurationError (Association named 'email_addresses' was not found on User; perhaps you misspelled it?):
/usr/lib/ruby/vendor_ruby/active_record/associations/join_dependency.rb:112:in build' /usr/lib/ruby/vendor_ruby/active_record/associations/join_dependency.rb:123:inblock in build'
/usr/lib/ruby/vendor_ruby/active_record/associations/join_dependency.rb:122:in each' /usr/lib/ruby/vendor_ruby/active_record/associations/join_dependency.rb:122:inbuild'
/usr/lib/ruby/vendor_ruby/active_record/associations/join_dependency.rb:18:in initialize' /usr/lib/ruby/vendor_ruby/active_record/relation/query_methods.rb:358:innew'
/usr/lib/ruby/vendor_ruby/active_record/relation/query_methods.rb:358:in build_joins' /usr/lib/ruby/vendor_ruby/active_record/relation/query_methods.rb:266:inbuild_arel'
/usr/lib/ruby/vendor_ruby/active_record/relation/query_methods.rb:260:in arel' /usr/lib/ruby/vendor_ruby/active_record/relation.rb:171:inexec_queries'
/usr/lib/ruby/vendor_ruby/active_record/relation.rb:160:in block in to_a' /usr/lib/ruby/vendor_ruby/active_record/explain.rb:41:inlogging_query_plan'
/usr/lib/ruby/vendor_ruby/active_record/relation.rb:159:in to_a' /usr/lib/ruby/vendor_ruby/active_record/relation/finder_methods.rb:381:infind_first'
/usr/lib/ruby/vendor_ruby/active_record/relation/finder_methods.rb:122:in first' /usr/lib/ruby/vendor_ruby/active_record/relation.rb:119:infirst_or_create'
plugins/redmine_omniauth_google/app/controllers/redmine_oauth_controller.rb:41:in try_to_login' plugins/redmine_omniauth_google/app/controllers/redmine_oauth_controller.rb:26:inoauth_google_callback'
/usr/lib/ruby/vendor_ruby/action_controller/metal/implicit_render.rb:4:in `send_action'

Reverting to 6b2deed, where there were no 'email_addresses', helped.

Redmine 2.4.2 out of Ubuntu 12.04 repository.