Solved merge conflict
Solved merge conflict


Former-commit-id: 4bb3cb266e01e1b559039f90b3024501378eae42 [formerly e52c99fd42f9db43efc94b6c623536a5eb75de0e]
Former-commit-id: 8f4e516662615a9de5144c4d2d7c11fea2c229ff
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine