config spec_helper.rb
Merge remote-tracking branch 'origin/dev' into dev