first_or_create doesn't play nicely with globalize
Merge branch 'fix-first-or-create' into 2-3-stable