Fix rspec
Merge branch 'master' into enqueue_with_locale