Fixed a merge bug
Fixed a merge bug


Former-commit-id: 084f28822e37ebf581976dcc27a6e1b344bc1696 [formerly b6f3acf9b66969671cfd518b88cba98bc865ed00] [formerly b6f3acf9b66969671cfd518b88cba98bc865ed00 [formerly 1e71743564b11f544cc25a1dda650a02f344ba34]]
Former-commit-id: 3f50bc66f1973e130b4117a628c431fc189886df
Former-commit-id: 072e50717603332ac1226e66123c9d2d57ff24ae
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine