Fixed a merge bug
Fixed a merge bug


Former-commit-id: 8771024d529306a4e7dac584e5ac076f27cc364a [formerly 8771024d529306a4e7dac584e5ac076f27cc364a [formerly 233470a87af5a9bca22601e079f8fd7db3f92969]]
Former-commit-id: f477d829af1527d6d49980d565ac0b4780abbd8d
Former-commit-id: 31115dd70b3068df70b73ce4eda4ef5da4dc1c17
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine