Merging master
Merging master


Former-commit-id: 2279fcae236d4f929d6011f49439865bef7c4ac0 [formerly 796f2768f37c22cea6e3f5f8f65f38444ccfcebc]
Former-commit-id: c0eb3d61e2a7c9fd7322ed217864be91301d6431
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine