Lock RSpec on version 2.x
Merge branch 'master' into feature/english-translations