Merge branch 'fix_rspec_deprecation_warning' into HEAD