elastic search, rspec
Merge commit '2c6c10be1b5b7425de8d1d1a0cb1e45a626f05d6'