Fixed a merge error
Fixed a merge error


Former-commit-id: 3358d8c152f803e20ccc46f390e892fc58b9f280 [formerly 99af8f595ae225b32b2273f1fde218ad4fac04c4] [formerly 99af8f595ae225b32b2273f1fde218ad4fac04c4 [formerly 3b59aea3d638c3ba34cf5d3a3447e1f2d2f6cbc3]]
Former-commit-id: 97815bcdbc39f1d71d8ed0a3007ad5e2ccbcb332
Former-commit-id: e01ebccf8fdc320911c0091110f43693769d4f3b
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine