Fixed a merge error
Fixed a merge error


Former-commit-id: 69e5e0122b81bf30c1fabf620cd70f2b73aa15f5 [formerly a100bc8ec08dc779eccb714b9815827465c9251a]
Former-commit-id: 73a33920725879426aafe402d5c455dec49c965b
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine