Fixed a merge error
Fixed a merge error


Former-commit-id: 803b69185bd8d7310841d6b34976a9a09748a841 [formerly 02b7aa1d6379cd14939f42eb15db610e978a8774]
Former-commit-id: 8b604ff62199c1258cf91ada78386b0ee9d08f8c
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine