Moved Pry out of test
Merge branch 'master' into elastic_v1